彭桃
|
31265bb9c0
|
新增获取家庭成员接口
|
2023-03-21 11:24:42 +08:00 |
|
monanxiao
|
123bf308e2
|
Merge branch 'monanxiao'
|
2023-03-20 18:01:18 +08:00 |
|
monanxiao
|
79a8ab55a0
|
Merge branch 'master' into monanxiao
|
2023-03-20 18:00:53 +08:00 |
|
monanxiao
|
ace97330b3
|
完善后台供应链小组提现业务逻辑
|
2023-03-20 18:00:08 +08:00 |
|
|
|
6ad5cc9644
|
修复路由错误
|
2023-03-20 17:39:52 +08:00 |
|
|
|
57f0c8f268
|
修复文章ui错误
|
2023-03-20 16:52:10 +08:00 |
|
|
|
64fb63ea00
|
修复文章ui错误
|
2023-03-20 16:49:06 +08:00 |
|
彭桃
|
b6fc04e547
|
1
|
2023-03-20 15:26:43 +08:00 |
|
彭桃
|
d87f908843
|
1
|
2023-03-20 15:12:35 +08:00 |
|
彭桃
|
437a893973
|
新增接收家庭成员邀请接口
|
2023-03-20 15:03:15 +08:00 |
|
monanxiao
|
a5132285c7
|
优化农科后台数据显示
|
2023-03-20 14:58:33 +08:00 |
|
monanxiao
|
9b44dfb02e
|
Merge branch 'master' into monanxiao
|
2023-03-20 13:39:12 +08:00 |
|
monanxiao
|
3fc2fcfe56
|
新增模型合并
|
2023-03-20 13:38:48 +08:00 |
|
monanxiao
|
5551e71140
|
Merge commit '2c8a41fc4fee222a3e823c58512683d27bc4f262'
|
2023-03-20 13:38:24 +08:00 |
|
monanxiao
|
12b53a8e9d
|
增加供应小组提现模型
|
2023-03-20 11:13:47 +08:00 |
|
|
|
de79f989a2
|
修复group_id 错误
|
2023-03-20 10:51:49 +08:00 |
|
monanxiao
|
3d1f845643
|
修复后台
|
2023-03-20 10:42:08 +08:00 |
|
monanxiao
|
2c8a41fc4f
|
更新后台用户相关，用户权限、用户信息等
|
2023-03-20 10:37:48 +08:00 |
|
monanxiao
|
034307d311
|
更新后台用户管理
|
2023-03-20 09:50:43 +08:00 |
|
monanxiao
|
bde85d8244
|
更新后台展示
|
2023-03-18 17:58:53 +08:00 |
|
monanxiao
|
0a937914bf
|
更新后台用户展示数据
|
2023-03-18 17:56:53 +08:00 |
|
|
|
0e0d48f25a
|
修改user_id
|
2023-03-18 17:37:05 +08:00 |
|
monanxiao
|
8bccaac1a8
|
Merge branch 'monanxiao'
|
2023-03-18 17:27:48 +08:00 |
|
monanxiao
|
28d1ae1aca
|
修改家庭成员排序规则
|
2023-03-18 17:27:39 +08:00 |
|
monanxiao
|
50d11c87ca
|
Merge branch 'monanxiao'
|
2023-03-18 17:15:48 +08:00 |
|
monanxiao
|
65cf043784
|
修复获取村名
|
2023-03-18 17:15:39 +08:00 |
|
monanxiao
|
3b920cc5d6
|
Merge branch 'monanxiao'
|
2023-03-18 17:14:08 +08:00 |
|
monanxiao
|
781fe13f0e
|
家庭成员增加户主排序
|
2023-03-18 17:13:55 +08:00 |
|
monanxiao
|
d3e2d1bce6
|
优化供应链小组增加
|
2023-03-18 17:10:35 +08:00 |
|
monanxiao
|
56d80852ff
|
商城更新用户信息获取，统一调整为商城用户，剔除无用表
|
2023-03-18 16:31:08 +08:00 |
|
monanxiao
|
11439763f8
|
Merge branch 'monanxiao'
|
2023-03-18 10:51:42 +08:00 |
|
monanxiao
|
43413c5778
|
优化后台供应链相关展示
|
2023-03-18 10:50:57 +08:00 |
|
liuxiaoquan
|
69a82e7c1c
|
合并本地
|
2023-03-17 18:16:04 +08:00 |
|
liuxiaoquan
|
2b4068e277
|
商户列表展示
|
2023-03-17 18:15:15 +08:00 |
|
彭桃
|
92f643420d
|
Merge branch 'master' of http://git.excellentkk.cn/mkm/nk-lihaink-cn
# Conflicts:
# composer.json
|
2023-03-17 17:36:32 +08:00 |
|
彭桃
|
bf4caf2b06
|
后台首页
|
2023-03-17 17:33:00 +08:00 |
|
liuxiaoquan
|
9d486fc375
|
Merge branch 'master' into lxq
¥解释此合并的必要性，尤其是将一个更新后的上游分支
|
2023-03-17 16:49:23 +08:00 |
|
liuxiaoquan
|
ef6cd16d1b
|
店铺保证金退回修复bug，未对接微信
|
2023-03-17 16:43:27 +08:00 |
|
monanxiao
|
014ec7768b
|
Merge branch 'monanxiao'
|
2023-03-17 14:36:53 +08:00 |
|
monanxiao
|
f46e73b648
|
完善供应链小组服务后台
|
2023-03-17 14:36:39 +08:00 |
|
monanxiao
|
4ffddd6bb7
|
Merge branch 'monanxiao'
|
2023-03-17 11:05:03 +08:00 |
|
monanxiao
|
2a05f47b13
|
更新地图Key
|
2023-03-17 11:04:19 +08:00 |
|
|
|
8a88c17f39
|
更新 'app/common/model/merchant/system/merchant/MerchantIntention.php'
删除平台客服写入
|
2023-03-17 10:13:38 +08:00 |
|
monanxiao
|
d25e79b5de
|
修复诉求详情，获取评论接口
|
2023-03-17 10:05:57 +08:00 |
|
monanxiao
|
8437fc597f
|
修复点赞功能
|
2023-03-17 10:00:22 +08:00 |
|
liuxiaoquan
|
3f9fb63437
|
退回保证金bug
|
2023-03-17 01:01:19 +08:00 |
|
liuxiaoquan
|
a6ac4a34e2
|
商户调整
|
2023-03-16 18:15:03 +08:00 |
|
liuxiaoquan
|
2d10db43fd
|
合并分支lxq
|
2023-03-16 17:37:23 +08:00 |
|
liuxiaoquan
|
1aa66250e9
|
更改审核入驻客服表连接
|
2023-03-16 17:35:41 +08:00 |
|
monanxiao
|
dcc0135919
|
更新后台增加供应链分组
|
2023-03-16 16:28:19 +08:00 |
|
