2875 Commits

Author SHA1 Message Date
33b33288e6 调整补贴余额查询 2024-03-16 16:43:56 +08:00
lihai
67382cfdf0 Merge pull request 'dev' (#180) from dev into master
Reviewed-on: #180
2024-03-16 13:54:46 +08:00
a548191e30 关闭补贴自动激活 2024-03-16 13:53:10 +08:00
fd161f381d 修改商户冻结金转账时间 2024-03-16 11:45:21 +08:00
lihai
300cf71d3b Merge pull request '修改用户邀请记录查询' (#179) from dev into master
Reviewed-on: #179
2024-03-15 11:06:55 +08:00
f68bc5b684 修改用户邀请记录查询 2024-03-15 11:05:47 +08:00
mkm
9e1af45bd7 Merge pull request 'dev' (#178) from dev into master
Reviewed-on: #178
2024-03-14 17:26:00 +08:00
mkm
7d2cc1e70f 更新 2024-03-14 17:24:36 +08:00
weipengfei
93a5b40cf8 更新h5-微信公众号自动授权 2024-03-14 17:24:36 +08:00
weipengfei
979f9c3871 更新h5-微信公众号自动授权 2024-03-14 17:24:36 +08:00
liu
6a12146f91 上传付款凭证 2024-03-14 17:24:36 +08:00
d62ab0fa87 调整授权登录 2024-03-14 17:24:36 +08:00
mkm
71f4df0845 更新 2024-03-14 16:41:39 +08:00
weipengfei
8ade2ccf7a 更新h5-微信公众号自动授权 2024-03-14 11:54:19 +08:00
weipengfei
bb7b9a78b2 更新h5-微信公众号自动授权 2024-03-14 11:48:39 +08:00
liu
ddcf367556 上传付款凭证 2024-03-13 17:19:07 +08:00
25fc0e598a 修改用户合并 2024-03-13 12:03:19 +08:00
6f6d1d7eae 修改用户合并 2024-03-13 12:03:19 +08:00
fdb7c4177a 修改用户合并 2024-03-13 12:03:19 +08:00
0e38d08ad3 修改用户合并 2024-03-13 12:03:19 +08:00
mkm
e42f5716f3 h5 2024-03-13 12:03:19 +08:00
f8530d9a28 修改用户合并 2024-03-13 12:03:19 +08:00
67e0e7b455 修改邀请记录 2024-03-13 12:03:19 +08:00
cbea0aa270 调整邀请注册 2024-03-13 12:03:19 +08:00
30242b1e96 调整订单数量查询,处理商户销售金额的错误 2024-03-13 12:03:19 +08:00
828e228ab6 调整退款的错误 2024-03-13 12:03:19 +08:00
222416cb08 调整订单推广人查询 2024-03-13 12:03:19 +08:00
liu
d826c9777a 商品导出excel 2024-03-13 12:03:19 +08:00
358906854c 调整确认收货 2024-03-13 12:03:19 +08:00
c044855072 添加路由 2024-03-13 12:02:55 +08:00
mkm
89d988cc60 更新 2024-03-13 12:02:55 +08:00
cf98018c6c 修改商户订单列表查询 2024-03-13 12:02:55 +08:00
liu
16e01495e4 超管后台排序修改 2024-03-13 12:02:55 +08:00
671230708f 订单退款,减少商户销售金额和采购金额 2024-03-13 12:02:55 +08:00
0964e3306c 修改用户合并 2024-03-13 10:41:39 +08:00
98a9ec10a9 修改用户合并 2024-03-13 10:38:42 +08:00
63504b1d2f 修改用户合并 2024-03-13 10:20:42 +08:00
8b1691d624 修改用户合并 2024-03-13 09:57:58 +08:00
af5e6e9a4f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-13 09:54:11 +08:00
24e532f980 修改用户合并 2024-03-13 09:54:05 +08:00
mkm
249a3611b6 h5 2024-03-13 09:43:37 +08:00
eebb013e4e 修改邀请记录 2024-03-12 18:04:59 +08:00
d36254a34a 调整邀请注册 2024-03-12 15:41:17 +08:00
d5fdcd2262 调整订单数量查询,处理商户销售金额的错误 2024-03-12 14:06:54 +08:00
be1b95d6d6 调整退款的错误 2024-03-12 11:38:05 +08:00
5f7648ccdc 调整订单推广人查询 2024-03-12 10:10:56 +08:00
c13dbd0145 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev 2024-03-12 09:56:32 +08:00
a0bf3b3432 调整确认收货 2024-03-12 09:56:20 +08:00
liu
53f2fbf9ae 商品导出excel 2024-03-12 09:50:33 +08:00
lihai
d7189ebf85 Merge pull request '修改微信授权登录' (#175) from fix_bug into master
Reviewed-on: #175
2024-03-12 09:16:37 +08:00