-
# Conflicts: # xingyun-api/src/main/resources/db/chujiang/base.sql
-
# Conflicts: # xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/GetContractDistributorStandardBo.java # xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/contract/QueryContractDistributorStandardBo.java # xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ContractDistributorStandard.java # xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java