Commit Graph

20 Commits (f78a0ede2b2bcb0cb3b0f3ab3993b586dae7cb63)

Author SHA1 Message Date
尚志豪123 f78a0ede2b 补充 2024-12-02 22:11:56 +08:00
尚志豪123 c34f14ed04 连接前端 2024-11-29 22:13:52 +08:00
尚志豪123 9be5cccbff 连接前端 2024-11-29 19:52:16 +08:00
尚志豪123 9d2869f177 Merge branch 'master' into 1129/shangzhihao
# 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/ActivityTeamProductSkuInfo.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/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-29 16:06:26 +08:00
尚志豪123 5e322b03e3 连接前端 2024-11-29 15:54:57 +08:00
DongZeLiang b6c4a790d7 fix():团购策略 2024-11-29 15:46:06 +08:00
尚志豪123 6301303502 批量添加,删除,修改 2024-11-28 15:37:24 +08:00
尚志豪123 47def732f2 Merge branch 'master' into 1127/shangzhihao
# Conflicts:
#	doc/团购查询单条数据结构.java
#	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/ActivityTeamProductSkuInfoModel.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-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProjectSkuResp.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 14:30:22 +08:00
尚志豪123 2f8ccdbb67 修改实体类 2024-11-27 14:28:57 +08:00
DongZeLiang 02f640092a fix():团购修改 2024-11-27 14:23:52 +08:00
DongZeLiang c6b7a3aa6a feat():团购活动查询详情方法实现 2024-11-27 10:27:42 +08:00
尚志豪123 817f3c97ba 回显 2024-11-27 10:00:09 +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