donghongyang 04d56560e6 Merge branch 'master' into 1129/donghongyang ... # Conflicts: # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuModel.java # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java		2024-11-29 16:57:04 +08:00
..
marketing-common	Merge branch 'master' into 1129/donghongyang	2024-11-29 16:57:04 +08:00
marketing-remote	feat(): 增加规则规格修改功能	2024-11-25 19:43:23 +08:00
marketing-server	Merge branch 'master' into 1129/donghongyang	2024-11-29 16:57:04 +08:00
pom.xml	feat(): 增加规则规格修改功能	2024-11-25 19:43:23 +08:00