WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Merged
XiaoLFeng merged 3 commits from feature-zrx into develop 2024-04-11 20:46:33 +08:00
Conversation 1 Commits 3 Files Changed 28 +617 -121
xiangZr-hhh commented 2024-04-11 17:31:02 +08:00
Owner
Copy Link
No description provided.
xiangZr-hhh added 1 commit 2024-04-11 17:31:03 +08:00
feat：增加新业务功能获取审核列表
Some checks failed
代码检查 / 代码检查 (pull_request) Failing after 21s
Details
365f2dfa67
XiaoLFeng added 2 commits 2024-04-11 20:22:48 +08:00 
# 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: 漏洞修补，规范化
All checks were successful
代码检查 / 代码检查 (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
Sign in to join this conversation.
Reviewers
No Reviewers
XiaoLFeng
Labels
Clear labels
bug
Something is not working
duplicate
This issue or pull request already exists
enhancement
New feature
help wanted
Need some help
invalid
Something is wrong
question
More information is needed
wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
362612387 Jenkins tuxiu21 weiduidui XCYH xiangZr-hhh XiaoLFeng yangna_guji yannqing
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: WxxyDeveloper/JSL_OrganizeInternalOA#10
No description provided.
Delete Branch "feature-zrx"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?