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

xiangZr-hhh · 2024-04-11T17:31:02+08:00

xiangZr-hhh commented

2024-04-11 17:31:02 +08:00

No description provided.

xiangZr-hhh added 1 commit 2024-04-11 17:31:03 +08:00

feat：增加新业务功能获取审核列表

代码检查 / 代码检查 (pull_request) Failing after 21s

Details

365f2dfa67

XiaoLFeng added 2 commits 2024-04-11 20:22:48 +08:00

Merge branch 'refs/heads/develop' into feature-zrx 061d469c17

# 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

patch: 漏洞修补，规范化

代码检查 / 代码检查 (pull_request) Successful in 20s

Details

381de9d54b

XiaoLFeng approved these changes 2024-04-11 20:46:26 +08:00

XiaoLFeng merged commit 383de6766f into develop

2024-04-11 20:46:33 +08:00

XiaoLFeng referenced this issue from a commit

2024-04-11 20:46:35 +08:00

Merge pull request 'feat：增加新业务功能获取审核列表' (#10) from feature-zrx into develop

Sign in to join this conversation.

No reviewers