feat:增加新业务功能获取审核列表 #10

Merged
XiaoLFeng merged 3 commits from feature-zrx into develop 2024-04-11 20:46:33 +08:00

3 Commits

Author SHA1 Message Date
381de9d54b
patch: 漏洞修补,规范化
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 20s
2024-04-11 20:22:42 +08:00
061d469c17
Merge branch 'refs/heads/develop' into feature-zrx
# Conflicts:
#	src/main/java/com/jsl/oa/aspect/AnnotationsAspect.java
#	src/main/java/com/jsl/oa/common/constant/SafeConstants.java
#	src/main/java/com/jsl/oa/controllers/PermissionController.java
#	src/main/java/com/jsl/oa/controllers/ProjectController.java
#	src/main/java/com/jsl/oa/controllers/RoleController.java
#	src/main/java/com/jsl/oa/controllers/UserController.java
#	src/main/java/com/jsl/oa/dao/ProjectDAO.java
#	src/main/java/com/jsl/oa/dao/RoleDAO.java
#	src/main/java/com/jsl/oa/dao/UserDAO.java
#	src/main/java/com/jsl/oa/mapper/ProjectMapper.java
#	src/main/java/com/jsl/oa/mapper/RoleMapper.java
#	src/main/java/com/jsl/oa/mapper/UserMapper.java
#	src/main/java/com/jsl/oa/services/ProjectService.java
#	src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
#	src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
#	src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
#	src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
#	src/main/java/com/jsl/oa/utils/Processing.java
2024-04-11 20:17:32 +08:00
xiangZr-hhh
365f2dfa67 feat:增加新业务功能获取审核列表
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 21s
2024-04-11 17:27:34 +08:00