疯狂的狮子li 568e2a9337 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: pom.xml ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml ruoyi-ui/src/components/Pagination/index.vue ruoyi-ui/src/permission.js ruoyi-ui/src/utils/request.js ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/server/index.vue ruoyi-ui/src/views/system/user/index.vue ruoyi-ui/src/views/system/user/profile/userInfo.vue		2022-02-24 15:30:20 +08:00
..
config	update [重大更新]全业务 增加 接口文档注解 格式化代码	2021-10-15 15:19:42 +08:00
controller	update 调整返回类型为 R	2022-01-29 11:48:41 +08:00
domain	update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题	2022-01-25 21:50:54 +08:00
mapper	[重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖	2022-01-12 21:22:26 +08:00
service	update 优化代码生成 使用新 JsonUtils.parseMap 方法	2022-02-15 17:32:33 +08:00
util	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2022-02-24 15:30:20 +08:00