Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 8b6b7aa7e4f2ae6ec14514875b559aa6890f3b1e

 src/views/system/modules/UserModal.vue

@@ -380,6 +380,7 @@
      disableSubmit: false,
      dateFormat: 'YYYY-MM-DD',
      validatorRules: {
        workNo:[{ required: true, message: '请输入工号!' }],
        username: [{ required: true, message: '请输入用户账号!' },
          { validator: this.validateUsername }],
        password: [