Skip to content
Snippets Groups Projects
Commit 72e21989 authored by wxy0715's avatar wxy0715
Browse files

Merge branch 'develop' into release/sumhs

# Conflicts:
#	ServiceSite/pom.xml
#	ServiceSite/src/main/java/com/seasky/adjustproject/application/command/service/AdjustPlanCmdServiceImpl.java
#	ServiceSite/src/main/java/com/seasky/adjustproject/application/command/service/SplitItemPlanCommandSvrImpl.java
#	ServiceSite/src/main/java/com/seasky/adjustproject/domain/service/SplitItemPlanDomainServiceImpl.java
parents c0ab3cd9 92d9f5ab
Branches release/sumhs
No related merge requests found
Pipeline #103426 failed with stage
Showing
with 41 additions and 646 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment