疯狂的狮子Li 86212f4818 Merge remote-tracking branch 'origin/dev' into warm-flow-future ...

# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java
#	ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java
#	ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java
#	ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java
#	ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
#	ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

2024-12-12 23:35:15 +08:00

..

ruoyi-demo

!613 refactor 优化代码

2024-12-12 14:15:59 +00:00

ruoyi-generator

update 优化 代码生成 增加buildQueryWrapper默认排序规则

2024-12-09 13:31:17 +08:00

ruoyi-job

删除powerjob相关

2024-05-17 10:47:42 +08:00

ruoyi-system

Merge remote-tracking branch 'origin/dev' into warm-flow-future

2024-12-12 23:35:15 +08:00

ruoyi-workflow

[add]

2024-12-12 12:29:03 +08:00

pom.xml

!491 合并flowable工作流功能

2024-03-05 14:57:39 +00:00