Go to file

xiaodong.hu 0669c4ad2d Merge branch 'master' into dev/feat/partner1.1_20230727

# 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

2023-07-27 20:02:41 +08:00

.m2

init

2023-05-19 15:17:45 +08:00

coolstore-partner-common

来源修改

2023-07-27 11:17:51 +08:00

coolstore-partner-dao

Merge branch 'master' into dev/feat/partner1.1_20230727

2023-07-27 20:02:41 +08:00

coolstore-partner-model

Merge branch 'master' into dev/feat/partner1.1_20230727