 TianYu
|
46686e4467
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-31 18:15:31 +08:00 |
|
TianYu
|
d904d0b6de
|
fix: 调整样式
|
2023-05-31 18:15:19 +08:00 |
tangqian
|
d7787d3193
|
fix: 修改部门
|
2023-05-31 18:10:48 +08:00 |
|
tangqian
|
45980a8c79
|
fix: 修改部门
|
2023-05-31 18:08:01 +08:00 |
|
tangqian
|
a37b5f0fcc
|
fix: 修改部门
|
2023-05-31 18:02:53 +08:00 |
|
tangqian
|
4a2765bd1b
|
Merge branch 'feature/mall_product'
|
2023-05-31 17:46:31 +08:00 |
|
tangqian
|
a4e18f6c9c
|
fix: 修改后台相关
|
2023-05-31 17:44:13 +08:00 |
|
tangqian
|
3ea7926767
|
Merge branch 'feature/mall_product'
|
2023-05-31 17:29:41 +08:00 |
|
tangqian
|
b86128c836
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-31 17:29:30 +08:00 |
|
tangqian
|
9f9cb30b03
|
fix: 修改后台相关
|
2023-05-31 17:29:24 +08:00 |
|
tianyu
|
da15156869
|
Merge pull request 'feature/mall_product' (#7) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/7
|
2023-05-31 17:22:06 +08:00 |
|
TianYu
|
56c643d785
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-31 17:21:26 +08:00 |
|
TianYu
|
c2debf6b82
|
feat: 增加用户协议
|
2023-05-31 17:21:08 +08:00 |
 Jruome
|
4616cd7ee9
|
uniapp 充值规则样式
|
2023-05-31 17:20:51 +08:00 |
|
Jruome
|
5846fe8425
|
uniapp 充值规则
|
2023-05-31 16:25:34 +08:00 |
|
TianYu
|
fd8d47ae81
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-31 15:00:37 +08:00 |
|
tianyu
|
fc13565838
|
Merge pull request 'feature/mall_product' (#6) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/6
|
2023-05-31 15:00:36 +08:00 |
|
TianYu
|
145c966b6e
|
fix: 抽佣明细-会员充值增加导出功能
|
2023-05-31 15:00:19 +08:00 |
|
tangqian
|
85adfec0db
|
fix: 推广员提成信息查询和导出. 商城提成
|
2023-05-31 14:58:00 +08:00 |
|
tangqian
|
2741f1cefe
|
fix: 推广员提成信息查询和导出. 商城提成
|
2023-05-31 13:56:41 +08:00 |
|
tangqian
|
160f9d306f
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-31 12:00:29 +08:00 |
|
tangqian
|
7619a9f220
|
fix: 推广员提成信息查询和导出. 商城提成
|
2023-05-31 12:00:24 +08:00 |
|
TianYu
|
039dee4f1d
|
fix: 修复代码报错
|
2023-05-31 11:47:23 +08:00 |
|
TianYu
|
035dd77dd4
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-31 11:06:39 +08:00 |
|
TianYu
|
0125502394
|
fix: 修复bug
|
2023-05-31 11:06:26 +08:00 |
|
tangqian
|
eadd9f2daa
|
Merge branch 'master' into feature/mall_product
|
2023-05-31 10:30:01 +08:00 |
|
tangqian
|
4e56534695
|
fix: 商城提成
|
2023-05-31 10:29:41 +08:00 |
|
TianYu
|
cceb889154
|
feat: 增加销售业绩
|
2023-05-31 09:37:30 +08:00 |
 perry
|
0dfbe4a2d4
|
Merge remote-tracking branch 'origin/master'
|
2023-05-31 00:11:19 +08:00 |
|
perry
|
3292a07845
|
抽佣
|
2023-05-31 00:10:36 +08:00 |
|
tangqian
|
7bfe815a90
|
fix: 异常加上状态码
|
2023-05-30 20:51:02 +08:00 |
|
tangqian
|
3a9deab4a5
|
fix: 异常加上状态码
|
2023-05-30 20:48:19 +08:00 |
|
tangqian
|
c737582293
|
fix: 异常加上状态码
|
2023-05-30 20:21:55 +08:00 |
|
tangqian
|
36956f30b8
|
Merge branch 'feature/mall_product'
|
2023-05-30 20:04:09 +08:00 |
|
tangqian
|
e00d646c35
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-30 20:03:48 +08:00 |
|
tangqian
|
ff2ef78be0
|
fix: 异常加上状态码
|
2023-05-30 20:03:43 +08:00 |
|
TianYu
|
cfc33024b8
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-30 19:45:28 +08:00 |
|
tianyu
|
863875676d
|
Merge pull request 'feature/mall_product' (#5) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/5
|
2023-05-30 19:45:08 +08:00 |
|
TianYu
|
2b52768408
|
fix: 修复bug
|
2023-05-30 19:44:45 +08:00 |
|
perry
|
095e70b4ab
|
Merge remote-tracking branch 'origin/master'
|
2023-05-30 19:36:56 +08:00 |
|
perry
|
5b9b503f33
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-30 19:36:18 +08:00 |
|
perry
|
e6cad45706
|
抽佣
|
2023-05-30 19:36:05 +08:00 |
|
TianYu
|
1351a9a075
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-30 19:35:31 +08:00 |
|
tianyu
|
a1b65ab051
|
Merge pull request 'feature/mall_product' (#4) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/4
|
2023-05-30 19:35:21 +08:00 |
|
TianYu
|
0e0450e48c
|
fix: 修复BUG
|
2023-05-30 19:35:18 +08:00 |
|
Jruome
|
82cc7cfd3e
|
uniapp 销售业绩联调
|
2023-05-30 19:03:08 +08:00 |
|
perry
|
819e2e20d2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/RechargeOrderRespVO.java
|
2023-05-30 18:41:44 +08:00 |
|
perry
|
fc29029540
|
抽佣
|
2023-05-30 18:40:55 +08:00 |
|
tangqian
|
58037e0ebd
|
fix: 异常加上状态码
|
2023-05-30 18:26:41 +08:00 |
|
TianYu
|
696b28e2d5
|
Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product
|
2023-05-30 17:18:45 +08:00 |