Merge remote-tracking branch 'origin/master'

src/views/system/dict/data.vue

@@ -233,12 +233,12 @@
           </div>
           <el-input-number v-model="form.dictSort" :precision="0" style="width: 100%" controls-position="right" :max="9999" :min="0" />
         </el-form-item>
-        <el-form-item class="labelHeight" label="参数状态" prop="status">
+        <el-form-item class="labelHeight" label="参数状态" prop="flag">
           <div slot="label" class="labelClass">
             <div class="labelName">参数状态</div>
             <div class="labelName">Status</div>
           </div>
-          <el-radio-group v-model="form.status">
+          <el-radio-group v-model="form.flag">
             <el-radio
               v-for="dict in statusOptions.filter(item => { return item.dictValue })"
               :key="dict.dictValue"

src/views/system/user/index.vue

@@ -935,7 +935,7 @@ export default {
         phone: undefined,
         username: undefined,
         userType: undefined,
-        roleList: undefined,
+        roleList: [],
         name: undefined,
         password: undefined,
         idNumber: undefined,