Commit Graph

447 Commits (7c79be72d2dcf072280b78584422c10228bb36ab)

Author SHA1 Message Date
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
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