 成英杰
|
ce1b8f30bd
|
2204A-cyj（入团）
|
2024-12-01 19:59:52 +08:00 |
|
成英杰
|
341383d398
|
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/ActivityTeamProductSkuInfo.java
# 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/req/ActivityTeamInfoUpdReq.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-12-01 19:39:43 +08:00 |
|
成英杰
|
517f694ec2
|
2204A-cyj
|
2024-12-01 15:22:16 +08:00 |
|
成英杰
|
d1d9109b43
|
2204A-cyj(回显)
|
2024-11-30 14:28:33 +08:00 |
|
成英杰
|
c02afc9a93
|
2204A-cyj(卡片)
|
2024-11-29 17:05:43 +08:00 |
DongZeLiang
|
b6c4a790d7
|
fix()：团购策略
|
2024-11-29 15:46:06 +08:00 |
|
成英杰
|
e4580e8bd1
|
2204A-cyj(客户端拼团列表)
|
2024-11-29 00:15:23 +08:00 |
|
成英杰
|
46a7e2e8db
|
2204A-cyj(11.27修改)
|
2024-11-27 22:32:07 +08:00 |
|
成英杰
|
0a636c4728
|
2204A-cyj(11.27分支)
|
2024-11-27 16:44:33 +08:00 |
|
成英杰
|
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 |
|
成英杰
|
31a678e88e
|
2204A-cyj(11.27分支)
|
2024-11-27 15:54:35 +08:00 |
|
成英杰
|
0d177ec339
|
2204A-cyj(回显)
|
2024-11-27 14:25:25 +08:00 |
|
DongZeLiang
|
02f640092a
|
fix()：团购修改
|
2024-11-27 14:23:52 +08:00 |
|
DongZeLiang
|
c6b7a3aa6a
|
feat()：团购活动查询详情方法实现
|
2024-11-27 10:27:42 +08:00 |
笨蛋
|
46a56bd7aa
|
2204A-cyj(回显)
|
2024-11-26 22:40:54 +08:00 |
|
笨蛋
|
0b3fc8cd50
|
2204A-cyj(回显)
|
2024-11-26 20:49:42 +08:00 |
|
笨蛋
|
0514f04a43
|
2204A-cyj(回显)
|
2024-11-26 20:43:29 +08:00 |
|
笨蛋
|
f5d50ce2cf
|
Merge branch 'master' into 1126/chengyingjie
|
2024-11-26 12:31:50 +08:00 |
|
DongZeLiang
|
a04925eab4
|
feat()：团购活动添加方法实现
|
2024-11-26 12:29:24 +08:00 |
|
笨蛋
|
2855601c13
|
Merge branch 'master' into 1125/chengyingjie
|
2024-11-26 11:20:20 +08:00 |
|
DongZeLiang
|
b75c102e2c
|
feat()：团购商品-团购service业务添加方法实现
|
2024-11-26 11:19:00 +08:00 |
|
笨蛋
|
d3a93de52b
|
Merge branch 'master' into 1125/chengyingjie
|
2024-11-26 10:53:47 +08:00 |
|
DongZeLiang
|
49ea16c908
|
feat()：团购商品-规格service业务添加方法实现
|
2024-11-26 10:51:26 +08:00 |
|
笨蛋
|
f9384d3b16
|
2204A-cyj-启动
|
2024-11-25 21: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 |