Commit Graph

10 Commits (e9924bcee8f17d2958ce3ff211e5018a515fa607)

Author SHA1 Message Date
cui-fubo e9924bcee8 fax():团购策略 2024-11-29 15:56:01 +08:00
cui-fubo 6b615b44b5 Merge branch 'master' into 1127/cuifubo
# 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-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-29 15:53:04 +08:00
DongZeLiang b6c4a790d7 fix():团购策略 2024-11-29 15:46:06 +08:00
崔福波 d8445def5e Merge branch 'master' into 1127/cuifubo
# 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/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-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:06:39 +08:00
崔福波 cc82c99880 fax():回显活动补全 2024-11-27 14:24:53 +08:00
DongZeLiang 02f640092a fix():团购修改 2024-11-27 14:23:52 +08:00
崔福波 3081f6df9e feat():团购活动查询详情方法实现 2024-11-27 10:34: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