小万的gitee e0f9840709 Merge remote-tracking branch 'origin/1125/wanwenjing' into 1125/wanwenjing ... # Conflicts: # muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.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/impl/ActivityTeamInfoServiceImpl.java		2024-11-26 19:55:58 +08:00
..
muyu-file	feat()：团购商品-团购添加完成	2024-11-26 19:53:47 +08:00
muyu-gen	feat()：团购商品-团购添加完成	2024-11-26 19:53:47 +08:00
muyu-job	feat()：团购商品-团购添加完成	2024-11-26 19:53:47 +08:00
muyu-marketing	Merge remote-tracking branch 'origin/1125/wanwenjing' into 1125/wanwenjing	2024-11-26 19:55:58 +08:00
muyu-product	feat()：团购商品-团购添加完成	2024-11-26 19:53:47 +08:00
muyu-shop-cart	feat()：团购商品-团购添加完成	2024-11-26 19:53:47 +08:00
muyu-system	feat()：团购商品-团购添加完成	2024-11-26 19:53:47 +08:00
pom.xml	feat(): 增加规则规格修改功能	2024-11-25 19:43:23 +08:00