Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/views/classifyManage/treeClassify/components/list-edit.vue

@@ -108,11 +108,11 @@
             placeholder="请输入"
           />
         </el-form-item>
-        <el-form-item label="与下层分隔:" prop="separate">
+        <el-form-item label="与下层分隔:" prop="separatorChar">
           <DictSelection
             dictName="分隔符"
             clearable
-            v-model="formData.separate"
+            v-model="formData.separatorChar"
           >
           </DictSelection>
         </el-form-item>
@@ -163,7 +163,7 @@
         name: '',
         code: '',
         ruleCode: '',
-        separate: '',
+        separatorChar: '',
         sortNum: '',
         remark: '',
         parentId: 0,

src/views/classifyManage/treeClassify/details.vue

@@ -141,7 +141,7 @@
                   <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
                     <el-form-item label="与下层分隔:">
                       <div class="ele-text-secondary">
-                        {{ current.separate }}
+                        {{ current.separatorChar }}
                       </div>
                     </el-form-item>
                   </el-col>