Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java ruoyi-ui/src/views/system/notice/index.vue ruoyi-ui/src/views/system/user/index.vue
5 years ago · efb938c370
parent 616fbc45ae 082b19e33a
commit efb938c370
2 changed files with 2 additions and 2 deletions
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@ -221,7 +221,7 @@ export default {
          { required: true, message: "公告标题不能为空", trigger: "blur" }
        ],
        noticeType: [
-          { required: true, message: "公告类型不能为空", trigger: "blur" }
+          { required: true, message: "公告类型不能为空", trigger: "change" }
        ]
      }
    };
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@ -422,7 +422,7 @@ export default {
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
        deptId: [
-          { required: true, message: "归属部门不能为空", trigger: "blur" }
+          { required: true, message: "归属部门不能为空", trigger: "change" }
        ],
        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" }