# Conflicts: # coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java