Merge remote-tracking branch 'origin/master'

data-room-ui/packages/BasicComponents/Input/setting.vue

@@ -71,15 +71,6 @@
           <SettingTitle>位置</SettingTitle>
           <div class="lc-field-body">
             <PosWhSetting :config="config" />
-          </div>
-           <SettingTitle v-if="config.border">边框</SettingTitle>
-          <div class="lc-field-body">
-            <BorderSetting
-              v-if="config.border"
-              label-width="100px"
-              :config="config.border"
-              :bigTitle='config.title'
-            />
           </div>
           <SettingTitle>旋转</SettingTitle>
           <div class="lc-field-body">