2793 Commits

Author SHA1 Message Date
liu
4a5caa8af3 Merge remote-tracking branch 'origin/dev' into dev 2024-03-11 10:57:02 +08:00
liu
f7f1d7c388 修复后台excel导出问题 2024-03-11 10:56:35 +08:00
9b066cdfb3 修改商户端订单实付金额展示 2024-03-11 10:55:40 +08:00
db8e9eb6b3 修改用户信息返回 2024-03-11 10:45:28 +08:00
2c06abadf4 添加红包使用记录 2024-03-11 10:32:38 +08:00
528635aeb7 商户余额支付,冻结订单金额 2024-03-11 10:09:36 +08:00
liu
16fead435b 修改查询条件 2024-03-11 09:19:39 +08:00
liu
d614cfc42a 修改优化查询 2024-03-09 18:31:13 +08:00
liu
a007894fa6 优化查询 2024-03-09 18:28:50 +08:00
liu
f8a4f0f71e 优化查询 2024-03-09 18:21:27 +08:00
liu
1bb6aff8b0 Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 17:53:11 +08:00
liu
657849f2cf 添加更新时间 2024-03-09 17:52:56 +08:00
dd5bfd7f11 修改商户冻结金额解冻时间 2024-03-09 17:51:51 +08:00
ca00b1ab27 调整商户押金记录 2024-03-09 16:50:09 +08:00
fc78d3af34 调试微信授权登录 2024-03-09 16:47:06 +08:00
2b56e360df Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-09 16:39:49 +08:00
879e56c3a5 调试微信授权登录 2024-03-09 16:39:38 +08:00
liu
2cc737cd20 Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 16:34:27 +08:00
liu
4fe3f45e7a 添加账单商家信息 2024-03-09 16:34:12 +08:00
60221e78e4 修改邀请记录 采购金额和销售金额的错误 2024-03-09 16:33:35 +08:00
dfa7e6e2c9 调试微信授权登录 2024-03-09 16:27:36 +08:00
14168f2fd8 调试微信授权登录 2024-03-09 16:26:49 +08:00
b1ccf3123d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-09 16:20:50 +08:00
e687dd5709 处理邀请记录的错误 2024-03-09 16:20:45 +08:00
liu
c23c28724a Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 16:05:35 +08:00
liu
c4c62d64cb 账单管理日账单查询修改 2024-03-09 16:05:20 +08:00
f10071a579 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-09 14:24:20 +08:00
1ef145cb81 修改用户信息返回 2024-03-09 14:24:16 +08:00
liu
5e33bfa9a4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 11:50:42 +08:00
liu
ea7a01ecf4 减少查询总数排序 2024-03-09 11:50:23 +08:00
6679124abf 处理推广佣金发放的错误 2024-03-09 11:12:03 +08:00
48ae67064f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-09 10:44:05 +08:00
cef1d65804 修改APP微信授权登录 2024-03-09 10:43:42 +08:00
liu
847b30637b Merge remote-tracking branch 'origin/dev' into dev 2024-03-09 10:03:00 +08:00
liu
acd937ab81 更改展示信息 2024-03-09 10:02:35 +08:00
liu
c54991b591 修改展示信息 2024-03-09 09:59:30 +08:00
liu
2790700d0b 更改展示信息 2024-03-09 09:47:53 +08:00
7048613cd1 处理推广佣金发放的错误 2024-03-09 09:39:52 +08:00
34187247aa 调整账号合并 2024-03-08 17:59:25 +08:00
1a335ed8b8 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-08 17:38:55 +08:00
03f99316bf 调整账号合并 2024-03-08 17:38:51 +08:00
liu
5bd918891d 新增excel银行卡账单导出格式 2024-03-08 17:29:54 +08:00
6b759c4be4 处理推广佣金到账的错误 2024-03-08 16:09:29 +08:00
d4ab5146d8 添加账号合并 2024-03-08 15:56:34 +08:00
bc4afc83b2 修改转账订单导出 2024-03-08 14:07:10 +08:00
50248f1c2b 调整商户冻结金额解冻 2024-03-08 11:05:36 +08:00
54bf58b197 调试微信授权登录 2024-03-07 17:41:49 +08:00
891ab45bdf 添加商户最低提现金额 2024-03-07 16:49:29 +08:00
cf4d515741 修改春耕补贴激活 2024-03-07 16:36:42 +08:00
0771bef93a 修改春耕补贴激活 2024-03-07 16:26:13 +08:00