Go to file

xiaodong.hu d9a7606579 Merge branch 'hxd/feat/partner1.5' into dev/feat/partner1.5_20231106

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
#	coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java

2023-10-26 19:04:09 +08:00

.m2

init

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

coolstore-partner-common

Merge branch 'hxd/feat/partner1.5' into dev/feat/partner1.5_20231106

2023-10-26 19:04:09 +08:00

coolstore-partner-dao

Merge branch 'hxd/feat/partner1.5' into dev/feat/partner1.5_20231106

2023-10-26 19:04:09 +08:00

coolstore-partner-model

Merge branch 'hxd/feat/partner1.5' into dev/feat/partner1.5_20231106