 冯某
|
001e2bd4be
|
222
|
2024-11-29 17:07:52 +08:00 |
|
冯某
|
c003b4f1c3
|
Merge remote-tracking branch 'origin/master' into 1127/Fengmou
# Conflicts:
# muyu-auth/src/main/resources/bootstrap.yml
# muyu-gateway/src/main/resources/bootstrap.yml
# muyu-modules/muyu-file/src/main/resources/bootstrap.yml
# muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
# muyu-modules/muyu-job/src/main/resources/bootstrap.yml
# muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
# muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java
# muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.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
# muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
# muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
# muyu-modules/muyu-system/src/main/resources/bootstrap.yml
# muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml
|
2024-11-27 15:10:14 +08:00 |
|
冯某
|
bba0551efa
|
111
|
2024-11-27 14:24:29 +08:00 |
DongZeLiang
|
02f640092a
|
fix()：团购修改
|
2024-11-27 14:23:52 +08:00 |
|
DongZeLiang
|
c6b7a3aa6a
|
feat()：团购活动查询详情方法实现
|
2024-11-27 10:27:42 +08:00 |
|
DongZeLiang
|
49ea16c908
|
feat()：团购商品-规格service业务添加方法实现
|
2024-11-26 10:51:26 +08:00 |
|
DongZeLiang
|
0afcfbdcd6
|
feat(): 增加规则规格修改功能
|
2024-11-25 19:43:23 +08:00 |