Commit Graph

13 Commits (30b6a2bf673caa58ffaeb3eedd735829cf857b69)

Author SHA1 Message Date
小万的gitee 30b6a2bf67 Merge remote-tracking branch 'origin/master' into 1125/wanwenjing
# Conflicts:
#	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/ActivityTeamInfoSaveReq.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
2024-11-27 00:26:23 +08:00
小万的gitee 49be23d2b6 feat():团购商品-团购添加完成了 2024-11-27 00:02:25 +08:00
小万的gitee e8a433bacd feat():团购商品-团购添加完成了 2024-11-26 20:07:57 +08:00
小万的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
DongZeLiang 090cf65bbe feat():团购商品-团购添加完成 2024-11-26 19:53:47 +08:00
DongZeLiang a04925eab4 feat():团购活动添加方法实现 2024-11-26 12:29:24 +08:00
DongZeLiang b75c102e2c feat():团购商品-团购service业务添加方法实现 2024-11-26 11:19:00 +08:00
DongZeLiang 49ea16c908 feat():团购商品-规格service业务添加方法实现 2024-11-26 10:51:26 +08:00
DongZeLiang 06ec124790 fix():修复pom备注 2024-11-25 20:50:09 +08:00
DongZeLiang 0afcfbdcd6 feat(): 增加规则规格修改功能 2024-11-25 19:43:23 +08:00
DongZeLiang 7b0eb509c9 feat(): 增加规则规格修改功能 2024-11-18 15:52:50 +08:00
DongZeLiang 79681ab469 初始化 2024-11-12 15:36:55 +08:00
DongZeLiang 4fa45f7b9a first commit 2024-11-12 15:36:01 +08:00