|
|
e961ee37c5
|
处理商品重复的问题
|
2023-06-09 17:14:11 +08:00 |
|
|
|
aa3ccf80fb
|
修改店铺账单的错误
|
2023-06-09 16:14:39 +08:00 |
|
|
|
51b2a34a5c
|
调整店铺列表字段
|
2023-06-09 15:51:28 +08:00 |
|
|
|
479c7fc6a3
|
店铺列表不再展示商品
|
2023-06-09 15:16:47 +08:00 |
|
|
|
3a4bcecece
|
调整商品预览
|
2023-06-09 14:54:24 +08:00 |
|
|
|
656108fcc9
|
调整快捷上传视频
|
2023-06-09 13:54:46 +08:00 |
|
|
|
b111bf2f62
|
添加快捷上传视频
|
2023-06-09 13:39:50 +08:00 |
|
|
|
a71d1029f1
|
添加快捷上传视频
|
2023-06-09 11:59:26 +08:00 |
|
|
|
4092436eb4
|
修改商品免审的错误
|
2023-06-09 11:42:18 +08:00 |
|
|
|
5b96056942
|
修改平台端商品列表查询
|
2023-06-08 17:42:10 +08:00 |
|
|
|
5a3176f1aa
|
修改商品审核的错误
|
2023-06-08 17:01:43 +08:00 |
|
|
|
031f66da22
|
修改商品上架的错误
|
2023-06-08 14:48:16 +08:00 |
|
|
|
a78270cc20
|
限制条码长度
|
2023-06-08 13:36:54 +08:00 |
|
|
|
151ba60e00
|
推荐商品仅展示镇街店铺商品
|
2023-06-08 11:28:16 +08:00 |
|
|
|
392a585ab5
|
Merge branch 'temp' into dev
|
2023-06-08 11:15:16 +08:00 |
|
|
|
f500373f52
|
临时创建的分支
|
2023-06-08 11:13:26 +08:00 |
|
|
|
205d8a15c3
|
更新
|
2023-06-08 10:51:46 +08:00 |
|
|
|
0c70bf33e9
|
Revert "Revert "Revert "Revert "Merge pull request 'kk' (#12) from kk into dev""""
This reverts commit 5f5d2014866e6eb291407d8f76ab55aca124af6a.
|
2023-06-08 10:30:16 +08:00 |
|
|
|
5f5d201486
|
Revert "Revert "Revert "Merge pull request 'kk' (#12) from kk into dev"""
This reverts commit a17269f9247e2096d6a7838e3d3aca8852455308.
|
2023-06-08 10:26:54 +08:00 |
|
|
|
a17269f924
|
Revert "Revert "Merge pull request 'kk' (#12) from kk into dev""
This reverts commit 364f9fd05626c8c78c6ada41efff31a97a4d1bb9.
|
2023-06-08 10:26:47 +08:00 |
|
|
|
364f9fd056
|
Revert "Merge pull request 'kk' (#12) from kk into dev"
This reverts commit 950a6e46fd3b3ae76e6db09643b06c374952d2c0.
|
2023-06-08 10:26:11 +08:00 |
|
|
|
950a6e46fd
|
Merge pull request 'kk' (#12) from kk into dev
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/12
|
2023-06-08 10:08:24 +08:00 |
|
|
|
1252465bee
|
Merge branch 'master' into kk
# Conflicts:
# .gitignore
# app/common/repositories/system/merchant/FinancialRecordRepository.php
# public/system.html
|
2023-06-08 10:06:41 +08:00 |
|
|
|
d7b7a0e0b9
|
修改商品搜索，店铺云商品列表
|
2023-06-07 18:13:42 +08:00 |
|
|
|
3c037a03f0
|
修复CloudMerchantSpu_错误
|
2023-06-07 16:03:01 +08:00 |
|
|
|
035f49be5c
|
修改用户可以申请的店铺类型
|
2023-06-07 14:42:50 +08:00 |
|
|
|
29b20cbedd
|
测试环境不校验验证码
|
2023-06-07 13:57:24 +08:00 |
|
|
|
5f75e53efb
|
测试环境不校验验证码
|
2023-06-07 13:38:58 +08:00 |
|
|
|
1da1b91dc6
|
修复错误
|
2023-06-07 12:00:40 +08:00 |
|
|
|
a5f819d353
|
修改采购订单的错误
|
2023-06-07 11:48:39 +08:00 |
|
|
|
dda7eddaaa
|
处理商品同步到云仓的错误
|
2023-06-07 10:49:53 +08:00 |
|
|
|
e13ee7279c
|
更新
|
2023-06-06 17:03:14 +08:00 |
|
|
|
ae200d7c75
|
修改店铺类型检索的错误
|
2023-06-06 17:00:44 +08:00 |
|
|
|
76f9fcbbb1
|
商户列表添加区域检索
|
2023-06-05 17:17:43 +08:00 |
|
|
|
86f069e6a7
|
修改平台端账单导出的错误，商户列表添加区域检索
|
2023-06-05 17:17:28 +08:00 |
|
|
|
da1d8ebcb2
|
商品新增字段：更新时间
|
2023-06-05 16:39:23 +08:00 |
|
|
|
302300b28e
|
修改账单统计的错误
|
2023-06-05 16:33:11 +08:00 |
|
|
|
ea3d5f95f0
|
禁止用户端检索服务团队
|
2023-06-05 16:05:49 +08:00 |
|
|
|
34d3408944
|
禁止用户端检索服务团队
|
2023-06-05 15:57:47 +08:00 |
|
|
|
13b18aadc9
|
忽略runtime目录
|
2023-06-05 15:46:49 +08:00 |
|
|
|
f95209e9df
|
调试农信支付
|
2023-06-05 15:40:11 +08:00 |
|
|
|
a0f3d2374b
|
商品添加更新时间
|
2023-06-05 15:14:12 +08:00 |
|
|
|
ff623034c2
|
商品添加更新时间
|
2023-06-05 14:59:45 +08:00 |
|
|
|
5a9fd1b8c4
|
修改商品创建的错误
|
2023-06-05 14:21:08 +08:00 |
|
|
|
f80bbcd2d8
|
回滚验证码缓存
|
2023-06-03 15:29:25 +08:00 |
|
|
|
265870715f
|
修改授权文件
|
2023-06-03 11:52:09 +08:00 |
|
|
|
97d0645a1c
|
调试支付
|
2023-06-03 11:41:32 +08:00 |
|
|
|
e09c7bb693
|
银行支付测试
|
2023-06-02 17:00:16 +08:00 |
|
|
|
7819033c4e
|
修改验证码缓存
|
2023-06-01 17:43:13 +08:00 |
|
|
|
0a250f33c0
|
修改店铺保证金状态更新
|
2023-06-01 11:03:20 +08:00 |
|
