2882 Commits

Author SHA1 Message Date
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
d865bf4fdb 店铺申请同步店铺资质 2024-03-07 16:10:05 +08:00
b7cad3cee8 店铺申请同步店铺资质 2024-03-07 16:00:57 +08:00
mkm
c91da6f955 Merge pull request 'dev' (#170) from dev into master
Reviewed-on: #170
2024-03-07 15:38:58 +08:00
92ed3cef19 处理转账订单的错误 2024-03-07 15:15:37 +08:00
1c6517ee20 修改转账订单 2024-03-07 14:54:08 +08:00
5396dde520 修改商户交易申请审核 2024-03-07 14:34:04 +08:00
mkm
324e24474f Merge pull request 'dev' (#169) from dev into master
Reviewed-on: #169
2024-03-07 14:23:09 +08:00
2d8eb9594d 供应链商品支持线下扫码支付 2024-03-07 14:14:31 +08:00
75cf794b46 修改补贴金额 2024-03-07 13:49:34 +08:00
2bad727408 修改补贴金额 2024-03-07 13:44:13 +08:00
b3fdae172b 修改春耕补贴发放 2024-03-07 12:25:41 +08:00
614c2bd4bf 修改商户交易信息保存 2024-03-07 11:58:55 +08:00
00068f33f0 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-07 11:50:23 +08:00
b1da50e180 修改店铺押金计算的错误 2024-03-07 11:50:19 +08:00
mkm
7b51e6cad8 更新h5 2024-03-07 11:21:53 +08:00
bbefb60065 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-07 11:20:49 +08:00
0cbe852ae8 修改商户交易申请 2024-03-07 11:20:44 +08:00
weipengfei
02b822897b 更新h5 2024-03-07 11:09:46 +08:00
weipengfei
3dcbc72e06 更新h5 2024-03-07 11:01:32 +08:00
7080bd162d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-07 10:44:29 +08:00
e833b21b46 订单支持商户余额支付 2024-03-07 10:44:25 +08:00
mkm
f9ca805c43 fixed 2024-03-06 19:45:45 +08:00
lihai
9ae8623f95 Merge pull request '添加订单列表查询' (#168) from dev into master
Reviewed-on: #168
2024-03-06 11:47:26 +08:00
1200f624d7 添加订单列表查询 2024-03-06 11:37:44 +08:00
lihai
07a8dbc821 Merge pull request 'dev' (#167) from dev into master
Reviewed-on: #167
2024-03-06 11:02:42 +08:00
535177563a 修改用户订单数量统计 2024-03-06 10:52:19 +08:00
e7d04893a7 修改增收补贴 2024-03-05 17:40:10 +08:00