tangqian
|
9f9cb30b03
|
fix: 修改后台相关
|
2023-05-31 17:29:24 +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
|
7619a9f220
|
fix: 推广员提成信息查询和导出. 商城提成
|
2023-05-31 12:00:24 +08:00 |
|
tangqian
|
4e56534695
|
fix: 商城提成
|
2023-05-31 10:29:41 +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 |
|
perry
|
e6cad45706
|
抽佣
|
2023-05-30 19:36:05 +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 |
|
tangqian
|
619d6fd50b
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-30 17:01:22 +08:00 |
|
tangqian
|
e1920cc1ee
|
fix: 异常加上状态码
|
2023-05-30 17:01:17 +08:00 |
|
perry
|
3702a8b4ef
|
商铺名称
|
2023-05-30 16:29:24 +08:00 |
|
perry
|
fe860b399a
|
租户数据权限
|
2023-05-30 10:59:55 +08:00 |
|
tangqian
|
3b9484ddaf
|
fix: 异常加上状态码
|
2023-05-29 21:31:07 +08:00 |
|
tangqian
|
985778eb03
|
fix: 异常加上状态码
|
2023-05-29 21:26:46 +08:00 |
|
tangqian
|
8ee487046c
|
fix: 异常加上状态码
|
2023-05-29 21:23:49 +08:00 |
|
tangqian
|
7ce9dabc95
|
fix: 退出登录忽略租户
|
2023-05-29 20:05:52 +08:00 |
|
tangqian
|
7709370ca5
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
|
2023-05-29 14:59:06 +08:00 |
|
tangqian
|
80937224e5
|
fix: 商城支付相关
|
2023-05-29 14:56:34 +08:00 |
|
perry
|
e79abc1405
|
分销数据统计
|
2023-05-29 12:54:00 +08:00 |
|
perry
|
21790ab31d
|
分销数据统计
|
2023-05-29 09:46:14 +08:00 |
|
tangqian
|
0736bd8e20
|
fix: 商城支付相关
|
2023-05-26 18:19:56 +08:00 |
|
tangqian
|
fe3648013c
|
fix: 商城支付相关
|
2023-05-26 18:18:52 +08:00 |
|
perry
|
ed48e31645
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-26 15:01:56 +08:00 |
|
perry
|
74a33ecb85
|
配置文件修改
|
2023-05-26 15:01:46 +08:00 |
|
tangqian
|
43dc44f495
|
fix: 商城支付微信返回jsapi
|
2023-05-26 14:39:02 +08:00 |
|
tangqian
|
be59002235
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-26 14:37:57 +08:00 |
|
tangqian
|
76c248f865
|
fix: 商城支付微信返回jsapi
|
2023-05-26 14:37:52 +08:00 |
 js199000131
|
c1f6ac1c2c
|
商品自定义权限
|
2023-05-26 14:26:15 +08:00 |
 小小张
|
3303efa85e
|
后台--运费模板：配送区域修改
|
2023-05-26 12:00:26 +08:00 |
|
tangqian
|
38b5bfde5d
|
fix: 充值相关
|
2023-05-26 09:24:36 +08:00 |
|
tangqian
|
ec433d0134
|
Merge branch 'master' into feature/mall_product
|
2023-05-26 09:24:16 +08:00 |
|
tangqian
|
c3a72e4245
|
fix: 充值相关
|
2023-05-25 18:46:56 +08:00 |
|
小小张
|
872ce8baf0
|
后台--运费模板：配送区域修改
|
2023-05-25 18:21:08 +08:00 |
|
小小张
|
03e595c92b
|
后台--运费模板：配送区域修改
|
2023-05-25 18:17:16 +08:00 |
|
小小张
|
39d922eb1b
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-25 18:08:24 +08:00 |
|
小小张
|
dc4c7504a7
|
后台--运费模板：配送区域修改
|
2023-05-25 18:08:07 +08:00 |
|
tangqian
|
65a76c4efd
|
fix: 充值相关
|
2023-05-25 18:05:56 +08:00 |
|
tangqian
|
f1ac990de7
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-25 17:44:42 +08:00 |
|
tangqian
|
88c8c3e459
|
fix: 充值相关
|
2023-05-25 17:44:35 +08:00 |
|
小小张
|
51581f66a6
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-25 16:49:44 +08:00 |
|
小小张
|
8873be7def
|
后台--运费模板：配送区域修改
|
2023-05-25 16:49:27 +08:00 |
|
tangqian
|
877fe3d3aa
|
fix: 充值相关
|
2023-05-25 15:55:27 +08:00 |
|
tangqian
|
f1755820b6
|
fix: 充值相关
|
2023-05-25 15:30:21 +08:00 |
|
tangqian
|
270e45433e
|
fix: 充值相关
|
2023-05-25 14:48:29 +08:00 |