wangyaowen050211 195db03014 Merge branch 'master' into 1126/wangyaowen ... # 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/ActivityTeamInfo.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/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:34:10 +08:00
..
muyu-file	fix()：团购修改	2024-11-27 14:23:52 +08:00
muyu-gen	fix()：团购修改	2024-11-27 14:23:52 +08:00
muyu-job	fix()：团购修改	2024-11-27 14:23:52 +08:00
muyu-marketing	Merge branch 'master' into 1126/wangyaowen	2024-11-27 15:34:10 +08:00
muyu-product	fix()：团购修改	2024-11-27 14:23:52 +08:00
muyu-shop-cart	fix()：团购修改	2024-11-27 14:23:52 +08:00
muyu-system	fix()：团购修改	2024-11-27 14:23:52 +08:00
pom.xml	feat(): 增加规则规格修改功能	2024-11-25 19:43:23 +08:00