# Conflicts: # coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java # coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java # coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml