# Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java # coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java # coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml