刘河平 3aee63815e Merge branch '1125/liuheping' into 1127/liuheping ... # Conflicts: # doc/团购查询单条数据结构.java # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoAddReq.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/ActivityTeamProductSkuInfoService.java # muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java		2024-11-27 11:07:00 +08:00
..
marketing-common	Merge branch '1125/liuheping' into 1127/liuheping	2024-11-27 11:07:00 +08:00
marketing-remote	feat(): 增加规则规格修改功能	2024-11-25 19:43:23 +08:00
marketing-server	Merge branch '1125/liuheping' into 1127/liuheping	2024-11-27 11:07:00 +08:00
pom.xml	feat(): 增加规则规格修改功能	2024-11-25 19:43:23 +08:00