Skip to content

Merge branch 'develop' into feature/developWXJ

王星君 requested to merge feature/developWxj into develop

Conflicts:

ServiceSite/facade/pom.xml

ServiceSite/pom.xml

ServiceSite/src/main/java/com/seasky/projectplan/application/command/projectplan/ProjectPlanSvrImpl.java

ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ProjectPlanBookMapper.xml

ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/fund/FundQueryServiceImpl.java

ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java

Merge request reports