wzj-boot

History

疯狂的狮子li c380b77617 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-ui/src/layout/index.vue

2021-08-19 17:33:46 +08:00

config

update springboot 升级 2.3.10 依赖全面升级适配

2021-05-14 16:58:09 +08:00

controller

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

2021-08-19 17:33:46 +08:00

domain

update 更新 SysJob 导入导出补全 SysUser 试图对象

2021-08-04 18:52:09 +08:00

mapper

update 对相关代码改动进行调整