95bfeab0bc
# Conflicts: # coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java # coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java # coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml # coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java