 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 |
DongZeLiang
|
b6c4a790d7
|
fix()：团购策略
|
2024-11-29 15:46:06 +08:00 |
|
DongZeLiang
|
02f640092a
|
fix()：团购修改
|
2024-11-27 14:23:52 +08:00 |
|
sujunlong6
|
6424c0ac8e
|
11.26
|
2024-11-27 10:39:48 +08:00 |
|
DongZeLiang
|
c6b7a3aa6a
|
feat()：团购活动查询详情方法实现
|
2024-11-27 10:27:42 +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 |