Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev

Conflicts: frontend/src/business/components/settings/personal/PersonSetting.vue
2020-05-12 10:55:24 +08:00 · 2020-05-12 10:55:24 +08:00 · f3766f3ef2
parent a89052bc6e d7ccef6ee5
commit f3766f3ef2
1 changed files with 4 additions and 4 deletions
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@ -126,7 +126,7 @@
          ],
        },
        rules:{
-          /*password: [
+          password: [
            {required: true, message: this.$t('user.input_password'), trigger: 'blur'},
            {
              required: true,
@ -134,7 +134,7 @@
              message: this.$t('member.password_format_is_incorrect'),
              trigger: 'blur'
            }
-          ],*/
+          ],
          newpassword: [
            {required: true, message: this.$t('user.input_password'), trigger: 'blur'},
            {