成英杰 f10ee15063 Merge branch 'master' into 1127/chengyingjie ... # 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/ActivityTeamProductSkuInfo.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/req/TeamInfoListReq.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/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 16:06:23 +08:00
..
团购修改数据结构.json	2204A-cyj(回显)	2024-11-27 14:25:25 +08:00
团购查询单条数据结构.java	feat()：团购活动查询详情方法实现	2024-11-27 10:27:42 +08:00
团购活动修改.java	fix()：团购修改	2024-11-27 14:23:52 +08:00
团购添加数据结构.java	feat()：团购商品-规格service业务添加方法实现	2024-11-26 10:51:26 +08:00