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

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" }
         ]
       }
     };

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" }