• tangwei's avatar
    Merge branch 'developer' into develop_ccs · 636a8167
    tangwei authored
    # Conflicts:
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
    #	amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
    解决冲突
    636a8167
Name
Last commit
Last update
..
ContractMapper.xml Loading commit data...
DutyPersonShiftMapper.xml Loading commit data...
DutyShiftMapper.xml Loading commit data...
DynamicFormColumnMapper.xml Loading commit data...
DynamicFormGroupMapper.xml Loading commit data...
DynamicFormInstanceMapper.xml Loading commit data...
FailureAuditMapper.xml Loading commit data...
FailureDetailsMapper.xml Loading commit data...
FailureMaintainMapper.xml Loading commit data...
FailureRepairlogMapper.xml Loading commit data...
FailureVerifyMapper.xml Loading commit data...
FireChemicalMapper.xml Loading commit data...
FireExpertsMapper.xml Loading commit data...
FireStationMapper.xml Loading commit data...
FireTeamMapper.xml Loading commit data...
FirefightersContactsMapper.xml Loading commit data...
FirefightersContractMapper.xml Loading commit data...
FirefightersEducationMapper.xml Loading commit data...
FirefightersJacketMapper.xml Loading commit data...
FirefightersMapper.xml Loading commit data...
FirefightersPostMapper.xml Loading commit data...
FirefightersThoughtMapper.xml Loading commit data...
FirefightersWorkexperienceMapper.xml Loading commit data...
KeySiteMapper.xml Loading commit data...
LinkageUnitMapper.xml Loading commit data...
MaintenanceCompanyMapper.xml Loading commit data...
OrgUsrMapper.xml Loading commit data...
RescueEquipmentMapper.xml Loading commit data...
SourceFileMapper.xml Loading commit data...
SpecialPositionStaffMapper.xml Loading commit data...
WaterResourceCraneMapper.xml Loading commit data...
WaterResourceHydrantMapper.xml Loading commit data...
WaterResourceIndexMapper.xml Loading commit data...
WaterResourceIotMapper.xml Loading commit data...
WaterResourceMapper.xml Loading commit data...
WaterResourceNaturalMapper.xml Loading commit data...
WaterResourcePoolMapper.xml Loading commit data...