YunaiV 398e2a225a Merge branch 'feature/easy-trans' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-dependencies/pom.xml # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java		2024-04-01 12:44:59 +08:00
..
main	Merge branch 'feature/easy-trans' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-04-01 12:44:59 +08:00
test	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-02-28 20:32:16 +08:00
test-integration	⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护	2023-12-08 22:17:52 +08:00