• tangwei's avatar
    Merge branch 'developer' into develop_ccs · 815440f3
    tangwei authored
    # Conflicts:
    #	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentIndex.java
    #	amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipmentIndexVO.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
    #	amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
    #	amos-boot-system-equip/src/main/resources/mapper/EquipmentIndexMapper.xml
    #	amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
    815440f3
Name
Last commit
Last update
..
.settings Loading commit data...
amos-boot-module-ccs-api Loading commit data...
amos-boot-module-command-api Loading commit data...
amos-boot-module-common-api Loading commit data...
amos-boot-module-demo-api Loading commit data...
amos-boot-module-equip-api Loading commit data...
amos-boot-module-fas-api Loading commit data...
amos-boot-module-jcs-api Loading commit data...
amos-boot-module-knowledgebase-api Loading commit data...
amos-boot-module-latentdanger-api Loading commit data...
amos-boot-module-maintenance-api Loading commit data...
amos-boot-module-patrol-api Loading commit data...
amos-boot-module-supervision-api Loading commit data...
amos-boot-module-tzs-api Loading commit data...
.classpath Loading commit data...
.project Loading commit data...
pom.xml Loading commit data...