Merge branch 'hbx0923' of gitee.com:hebingxue/docs into hbx0923

9147d52a · hebingxue · 280a29da · e9045f34 · 9147d52a
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

zh-cn/application-dev/reference/arkui-ts/ts-basic-components-textinput.md ...n-dev/reference/arkui-ts/ts-basic-components-textinput.md +0 -1

未找到文件。
--- a/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-textinput.md
+++ b/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-textinput.md
@@ -20,7 +20,6 @@ TextInput(value?:{placeholder?: ResourceStr, text?: ResourceStr, controller?: Te

 | 参数名                     | 参数类型                                     | 必填   | 参数描述            |
 | ----------------------- | ---------------------------------------- | ---- | --------------- |
-<<<<<<< Updated upstream
 | placeholder   | [ResourceStr](ts-types.md#resourcestr)       | 否    | 无输入时的提示文本。      |
 | text          | [ResourceStr](ts-types.md#resourcestr)       | 否    | 设置输入框当前的文本内容。     |
 | controller<sup>8+</sup> | [TextInputController](#textinputcontroller8) | 否    | 设置TextInput控制器。 |