tangqian
|
581e6b74ae
|
Merge branch 'feature/mall_product' into test
|
2023-06-16 10:37:41 +08:00 |
|
tangqian
|
3a9b7376f2
|
fix:推广员导出
|
2023-06-16 10:37:28 +08:00 |
|
tangqian
|
6f7d2767e4
|
Merge branch 'feature/mall_product' into test
|
2023-06-16 09:47:02 +08:00 |
|
tangqian
|
b7dcf93fb3
|
fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己
|
2023-06-16 09:46:49 +08:00 |
|
tangqian
|
94bf7664ab
|
Merge branch 'feature/mall_product' into test
|
2023-06-16 09:14:37 +08:00 |
|
tangqian
|
8d6bfcdcdd
|
fix:修改用于测试跳转金额
|
2023-06-15 16:20:04 +08:00 |
|
tangqian
|
692263438c
|
fix:修改用于测试跳转金额
|
2023-06-15 14:07:00 +08:00 |
|
tangqian
|
68db974170
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-15 09:41:31 +08:00 |
|
tangqian
|
72beac0b3a
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-14 18:17:21 +08:00 |
|
tangqian
|
1389bb9b91
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-14 16:09:08 +08:00 |
|
tangqian
|
8c740295c2
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-13 16:40:23 +08:00 |
|
tangqian
|
9bf1a14ae6
|
fix:修改充值订单导出(未退款但是退款金额显示有金额)
|
2023-06-13 14:19:16 +08:00 |
|
tangqian
|
5eec2d9820
|
fix: 修改
|
2023-06-09 19:08:08 +08:00 |
|
tangqian
|
24467a92a6
|
fix: 修改
|
2023-06-09 18:24:13 +08:00 |
|
tangqian
|
fe4236d607
|
fix: 修改
|
2023-06-09 15:19:17 +08:00 |
|
tangqian
|
eca405b763
|
fix: 修改
|
2023-06-09 14:55:56 +08:00 |
|
tangqian
|
cf9be203b1
|
fix: 修改
|
2023-06-09 14:32:23 +08:00 |
|
tangqian
|
0d0623276b
|
fix: 修改
|
2023-06-09 13:52:54 +08:00 |
|
tangqian
|
c231870cad
|
fix: 修改
|
2023-06-08 16:43:51 +08:00 |
|
tangqian
|
81f1fb70b9
|
fix: 只查询已付款的订单
|
2023-06-08 11:48:56 +08:00 |
|
tangqian
|
9bef9b0cc3
|
fix: 修改相关提成单位
|
2023-06-02 16:03:47 +08:00 |
|
tangqian
|
e1aaf55a53
|
fix: 修改相关提成单位
|
2023-06-02 15:44:51 +08:00 |
|
tangqian
|
413ded83a9
|
fix: 修改相关提成单位
|
2023-06-02 11:05:09 +08:00 |
|
tangqian
|
6d3211e7b9
|
fix: 修改部门
|
2023-06-02 10:35:18 +08:00 |
|
tangqian
|
54cc1cde59
|
Merge branch 'feature/mall_product'
|
2023-06-02 10:34:52 +08:00 |
|
tangqian
|
e2328d8567
|
fix: 修改部门
|
2023-06-02 10:34:38 +08:00 |
|
tangqian
|
a1321eaca1
|
fix: 修改部门
|
2023-06-01 19:06:27 +08:00 |
|
tangqian
|
cf897c2b9c
|
fix: 修改部门
|
2023-06-01 18:46:06 +08:00 |
|
tangqian
|
0512c04391
|
fix: 修改部门
|
2023-06-01 17:35:18 +08:00 |
|
tangqian
|
b168d8a899
|
fix: 修改部门
|
2023-06-01 14:11:28 +08:00 |
|
tangqian
|
06a0f96bf1
|
fix: 修改部门
|
2023-06-01 11:27:11 +08:00 |
 perry
|
ad21968346
|
抽佣
|
2023-06-01 10:52:55 +08:00 |
|
tangqian
|
45980a8c79
|
fix: 修改部门
|
2023-05-31 18:08:01 +08:00 |
|
tangqian
|
a4e18f6c9c
|
fix: 修改后台相关
|
2023-05-31 17:44:13 +08:00 |
|
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 |