253 Commits

Author SHA1 Message Date
c2d875b6b7 修改补贴金额展示的错误 2024-03-20 16:51:00 +08:00
c518d87b39 修改补贴金额的错误 2024-03-20 16:38:50 +08:00
5af33cdc7d 修改订单数量统计的错误 2024-03-20 16:19:30 +08:00
15131252f1 修改商户入驻申请审核 2024-03-20 16:03:17 +08:00
d7663328ac 调整订单默认配送方式 2024-03-20 15:48:17 +08:00
55968578cf 修改扫码商品获取 2024-03-20 15:33:47 +08:00
e51561a7cb Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-20 15:29:52 +08:00
373cd3a5dc 修改扫码商品获取 2024-03-20 15:29:48 +08:00
mkm
8310d742c7 更新 2024-03-20 13:34:06 +08:00
liu
db870ba53e 更新申请接口 2024-03-20 12:08:32 +08:00
liu
230847a59b 更新申请接口 2024-03-20 11:57:33 +08:00
liu
7675060d60 详情更改 2024-03-20 11:40:42 +08:00
liu
7bffc57f20 修改上传类型更改 2024-03-20 11:35:36 +08:00
160eb5fbc2 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-20 11:05:58 +08:00
d5a81d6ba4 修改补贴列表 2024-03-20 11:05:47 +08:00
liu
802faea110 修改上传类型判断 2024-03-20 11:04:35 +08:00
2c07c80bcc 修改待付款订单 2024-03-20 10:33:43 +08:00
181b999350 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-20 10:23:02 +08:00
fc5885494b 扫码支付不扣库存 2024-03-20 10:22:33 +08:00
liu
88d4efc723 增加财务上传成功修改 2024-03-20 09:58:59 +08:00
ad48d8aba6 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-20 09:21:56 +08:00
ce2c3817ba 修改财务流水保存的错误 2024-03-20 09:11:20 +08:00
liu
0f35b7e76a 修改财务审批状态 2024-03-20 08:58:27 +08:00
liu
7035e7c6a7 修改审批状态 2024-03-19 18:24:44 +08:00
7baf7ccf34 添加店铺信息 2024-03-19 18:08:16 +08:00
liu
d4ea770ff6 新增返回字段 2024-03-19 17:57:25 +08:00
liu
dbcf3769d7 处理调用查询第三方条码接口 2024-03-19 17:47:29 +08:00
mkm
efb4ee41c1 更新pc 2024-03-19 17:43:42 +08:00
586684707e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-19 17:14:21 +08:00
d13a0d5edb 调整APP上传 2024-03-19 17:14:16 +08:00
liu
4ac308d735 修改审核返回参数 2024-03-19 16:56:34 +08:00
11e2699bfa Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-19 16:51:21 +08:00
e4fdf06f22 调整商品批发价 2024-03-19 16:51:16 +08:00
liu
4849540761 商户权限限制新增批发价 2024-03-19 16:13:11 +08:00
liu
db6ef815aa 免审编辑和商户端入库管理搜索名称入库 2024-03-19 15:52:01 +08:00
4f0d5b2dd9 调整补贴发放 2024-03-19 15:40:12 +08:00
a9d9212db7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-19 15:17:44 +08:00
7c7a806dfe 调整补贴发放 2024-03-19 15:17:39 +08:00
liu
e6560cc3b0 app版本 2024-03-19 14:39:47 +08:00
liu
155033a7d5 更新app版本路由 2024-03-19 14:25:57 +08:00
liu
3f2b5b738d 标签代码的迁移 2024-03-19 14:21:38 +08:00
mkm
d71aaa72a7 条码支付 2024-03-19 14:16:58 +08:00
liu
530c29604b 修改限制 2024-03-19 13:47:22 +08:00
liu
372fe79cfd 更新主表批发价 2024-03-19 13:35:07 +08:00
liu
01857bbd8b 返回批发价 2024-03-19 11:58:40 +08:00
liu
8bddb832cc 创建修改商品的时候的商户代码迁移 2024-03-19 11:36:07 +08:00
62bd597ac5 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-19 11:27:02 +08:00
3353d52a62 修改商品列表查询 2024-03-19 11:26:57 +08:00
liu
3371a7391e app版本管理和商户商品的修改批发价格 2024-03-19 10:59:11 +08:00
224f7707f1 调整大礼包限购 2024-03-19 10:52:55 +08:00