xiruipeng
pushed to master at xieshengjie/sis
c77ff5243f Merge remote-tracking branch 'origin/master'
# Conflicts:
# web/backmanagerconfig/pom.xml
# web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/ProjectController.java
# web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/test/XrpProjectplanServiceController.java
# web/backmanagerconfig/src/main/java/com/gyee/backconfig/mapper/auto/XrpProjectplanMapper.java
# web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/BackConfigService.java
# web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IProjectService.java
# web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/ProjectServiceImpl.java
# web/backmanagerconfig/src/main/resources/application-jn.yml
# web/backmanagerconfig/src/test/java/BackConfigMainTests.java
# web/backmanagerconfig/src/test/java/MyBatisPlusServiceTest.java
# web/backmanagerconfig/src/test/java/MyBatisPlusWrapperTest.java
# web/backmanagerconfig/src/test/java/MybatisPlusPluginsTest.java
- e0aebedcbd xrp-mybatis-wrapper计划电量增删改查
- View comparison for these 2 commits »
2 years ago
