*

dsk-operate-ui/src/views/enterpriseManagement/programme.vue

@@ -142,7 +142,7 @@
           ></el-tree>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input :disabled="disabled" v-model="form.remark" maxlength="50" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input :disabled="disabled" v-model="form.remark" maxlength="50" type="textarea" placeholder="请输入文字（50字以内）"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" v-if="!disabled">

dsk-operate-ui/src/views/system/user/index.vue

@@ -370,6 +370,10 @@
               <font color="red">导入失败</font>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="deptName"
+            label="所属组织">
+          </el-table-column>
           <el-table-column
             prop="nickName"
             label="用户昵称">