6
0
Fork 0
Commit Graph

1550 Commits (ae69749f9391d10501db32a1663dcfdaba2eecec)

Author SHA1 Message Date
vine_liutk df359cfb90 Merge branch 'develop' into 1.x 2022-02-23 14:53:45 +08:00
vine_liutk d0ca429c4c 修改 2022-02-23 14:53:17 +08:00
vine_liutk 55400515e5 后台优化调整 2022-02-23 14:52:27 +08:00
vine_liutk 04d339c552 添加拒绝收款的表单提示 2022-02-23 13:44:48 +08:00
vine_liutk 292f3e82eb 调整后台拒绝收款 2022-02-23 13:44:48 +08:00
vine_liutk 65e3448407 添加拒绝收款的表单提示 2022-02-23 13:43:51 +08:00
vine_liutk cfef324f10 调整后台拒绝收款 2022-02-23 13:43:51 +08:00
李静 5b1ee373c3 Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x 2022-02-23 13:27:34 +08:00
李静 b331b42390 WIP 2022-02-23 13:27:15 +08:00
李静 d2b47e3505 Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x 2022-02-23 11:47:04 +08:00
vine_liutk 3747375a92 处理N+1问题 2022-02-23 11:46:38 +08:00
李静 19a6f3da07 Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x 2022-02-23 11:42:20 +08:00
李静 e083de9df3 进货补贴日志 2022-02-23 11:42:03 +08:00
vine_liutk 56462f8530 调整资金列表N+1问题 2022-02-23 11:18:35 +08:00
李静 390fed8478 Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x 2022-02-23 11:14:20 +08:00
vine_liutk 2a3f6c6953 调整批零资金返回 2022-02-23 11:13:03 +08:00
vine_liutk 243d3700a5 添加后台批零订单详情字段显示 2022-02-23 10:39:03 +08:00
vine_liutk f3bd7a5673 添加资金打款余额支付 2022-02-23 10:35:46 +08:00
vine_liutk ca56e33f7d Merge branch '1.3.x' into 1.x 2022-02-23 09:55:27 +08:00
vine_liutk 764efe86ad 优化小程序登录 2022-02-23 09:54:20 +08:00
vine_liutk aa74028ca2 小程序授权登录1.0 2022-02-22 18:09:00 +08:00
李静 b5dbb1dfde Fix bug 2022-02-22 17:44:14 +08:00
李静 6c4e01168c 优化皮零订单 2022-02-22 15:35:21 +08:00
李静 a466084488 批零微信支付开关 2022-02-22 14:34:40 +08:00
李静 7b7f998645 批零微信支付 2022-02-22 13:59:46 +08:00
vine_liutk ce2a438f69 添加余额转账明细 2022-02-22 11:09:24 +08:00
vine_liutk 6fb338a443 批领余额转账 2022-02-21 17:37:46 +08:00
李静 4f4d6a5115 Update 2022-02-21 17:26:31 +08:00
vine_liutk dd6aa228e1 Merge branch '1.2.x' into develop 2022-02-21 17:14:41 +08:00
李静 a34d0f9bf9 系统订单拒绝收款 2022-02-21 17:12:23 +08:00
李静 4b0de4d633 将订单标记2待付款 2022-02-21 17:12:23 +08:00
vine_liutk e3c5ce45dc 添加批零提现到银行卡需要支付密码 2022-02-21 17:11:27 +08:00
李静 0e53eb73d3 系统订单拒绝收款 2022-02-21 15:41:10 +08:00
李静 4a3ac1cbee Update 2022-02-21 11:11:09 +08:00
李静 07ac327982 将订单标记2待付款 2022-02-21 10:11:25 +08:00
vine_liutk 0f6be1f1ae 添加初始化猜你喜欢分区 2022-02-18 15:49:53 +08:00
李静 02f3422077 预收益日志增加变更销售值 2022-02-18 15:03:14 +08:00
李静 13302b3246 粉丝统计增加个人成长值 2022-02-18 14:01:22 +08:00
李静 36c0ba9cfc
!7 Fix
Merge pull request !7 from 李静/N/A
2022-02-18 02:33:14 +00:00
李静 b40263cfe0
Fix 2022-02-18 02:32:53 +00:00
李静 6af17d0e51 Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server 2022-02-17 21:18:19 +08:00
李静 ea48eb9fd2 Fix 2022-02-17 21:18:01 +08:00
李静 60ffdb942c Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server 2022-02-17 21:14:46 +08:00
vine_liutk bad1b8e080 添加导入特殊等级标记 2022-02-17 21:11:39 +08:00
vine_liutk df124a8dc8 Merge branch 'hotfix/fix-dealer-settle' into develop 2022-02-17 21:10:56 +08:00
vine_liutk 2818c96092 交换时间筛选位置 2022-02-17 21:10:33 +08:00
vine_liutk 89bf5b15c4 添加导入订单脚本 2022-02-17 21:09:42 +08:00
李静 fb9f822ff5
!5 优化经销商结算
Merge pull request !5 from 李静/hotfix/fix-dealer-settle
2022-02-17 10:23:02 +00:00
李静 b5d378ffff Fix 2022-02-17 16:17:14 +08:00
李静 627932720b
!4 新版本确认收货后,自动放弃售后
Merge pull request !4 from 李静/hotfix/verison-compatible
2022-02-17 07:16:15 +00:00