Conflicts: service/src/main/java/com/hzya/frame/mdm/entity/MdmDto.java service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/IMdmModuleDao.java service/src/main/java/com/hzya/frame/mdm/mdmModule/dao/impl/MdmModuleDaoImpl.java service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/IMdmModuleDbDao.java service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/dao/impl/MdmModuleDbDaoImpl.java service/src/main/java/com/hzya/frame/mdm/mdmModuleDb/entity/MdmModuleDbEntity.xml service/src/main/java/com/hzya/frame/mdm/mdmModuleDbFileds/entity/MdmModuleDbFiledsEntity.java service/src/main/java/com/hzya/frame/mdm/mdmModuleDistribute/entity/MdmModuleDistributeEntity.java service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.java service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/entity/MdmModuleSourceEntity.xml service/src/main/java/com/hzya/frame/mdm/service/IMdmService.java service/src/main/java/com/hzya/frame/mdm/service/IMdmServiceCache.java service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceCache.java service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java |
||
---|---|---|
.. | ||
src | ||
pom.xml |