Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/system/user/index.vue

@@ -68,7 +68,7 @@
                   style="width: 200px"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_user_is_lock"
+                    v-for="dict in dict.type.sys_normal_disable"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"