Merge remote-tracking branch 'origin/master'

itdmWeb/src/views/system/modules/UserModal.vue

@@ -53,13 +53,13 @@
         </a-form-model-item>
 
         <a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
-<!--          <j-multi-select-tag-->
-<!--                  :disabled="disableSubmit"-->
-<!--                  v-model="model.selectedroles"-->
-<!--                  :options="rolesOptions"-->
-<!--                  placeholder="请选择角色">-->
-<!--          </j-multi-select-tag>-->
-          <j-search-select-tag v-model="model.selectedroles" dict="sys_role,role_name,id"  />
+          <j-multi-select-tag
+                  :disabled="disableSubmit"
+                  v-model="model.selectedroles"
+                  :options="rolesOptions"
+                  placeholder="请选择角色">
+          </j-multi-select-tag>
+<!--          <j-search-select-tag v-model="model.selectedroles" dict="sys_role,role_name,id"  />-->
         </a-form-model-item>
 
         <!--部门分配-->