俞扬 95bfeab0bc Merge branch 'master' into dev/feat/partner1.4_20231009 ...

# 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

2023-09-19 10:34:52 +08:00

..

src/main/java/com/cool/store

Merge branch 'master' into dev/feat/partner1.4_20231009

2023-09-19 10:34:52 +08:00

pom.xml

fix

2023-06-30 11:09:53 +08:00