sujunlong6 f6a56a9e6b Merge remote-tracking branch 'refs/remotes/origin/master' into 1127/sujunlong ... # 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/model/TeamProductDiscountPriceModel.java # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.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 # muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml		2024-11-29 16:22:34 +08:00
..
marketing-common	Merge remote-tracking branch 'refs/remotes/origin/master' into 1127/sujunlong	2024-11-29 16:22:34 +08:00
marketing-remote	feat(): 增加规则规格修改功能	2024-11-25 19:43:23 +08:00
marketing-server	fix()：团购策略	2024-11-29 15:46:06 +08:00
pom.xml	feat(): 增加规则规格修改功能	2024-11-25 19:43:23 +08:00