• limei's avatar
    Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer · ca7dc288
    limei authored
    # Conflicts:
    #	amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/constants/XJConstant.java
    #	amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java
    #	amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java
    ca7dc288
Name
Last commit
Last update
..
src/main Loading commit data...
.factorypath Loading commit data...
.gitignore Loading commit data...
pom.xml Loading commit data...