|
|
3a97605c1c
|
修复错误
|
2023-03-22 13:35:24 +08:00 |
|
彭桃
|
caaf18febc
|
1
|
2023-03-21 15:45:46 +08:00 |
|
|
|
f84e122636
|
显示网络名
|
2023-03-21 15:31:14 +08:00 |
|
彭桃
|
5bf79646a2
|
1
|
2023-03-21 14:28:51 +08:00 |
|
彭桃
|
31265bb9c0
|
新增获取家庭成员接口
|
2023-03-21 11:24:42 +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 |
|
|
|
0e0d48f25a
|
修改user_id
|
2023-03-18 17:37:05 +08:00 |
|
monanxiao
|
28d1ae1aca
|
修改家庭成员排序规则
|
2023-03-18 17:27:39 +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
|
d25e79b5de
|
修复诉求详情，获取评论接口
|
2023-03-17 10:05:57 +08:00 |
|
monanxiao
|
8437fc597f
|
修复点赞功能
|
2023-03-17 10:00:22 +08:00 |
|
liuxiaoquan
|
8cd4ef91f6
|
重新提交冲突文件
|
2023-03-16 12:18:52 +08:00 |
|
liuxiaoquan
|
bcf8957a67
|
冲突文件
|
2023-03-16 12:02:28 +08:00 |
|
彭桃
|
2c23ad498b
|
1
|
2023-03-16 11:57:40 +08:00 |
|
monanxiao
|
56e96cb999
|
解决冲突文件
|
2023-03-16 11:57:40 +08:00 |
|
liuxiaoquan
|
223ac01453
|
变基：合并最新分支lxq
|
2023-03-16 11:45:33 +08:00 |
|
彭桃
|
4432c47dd0
|
1
|
2023-03-16 10:50:58 +08:00 |
|
monanxiao
|
d301d2eb9f
|
解决冲突文件
|
2023-03-15 18:07:41 +08:00 |
|
monanxiao
|
3ac2567f06
|
合并
|
2023-03-15 17:06:21 +08:00 |
|
彭桃
|
af6d415265
|
1
|
2023-03-14 15:12:12 +08:00 |
|
|
|
e1c8bc4b45
|
Merge remote-tracking branch 'bb/master'
|
2023-03-14 14:51:32 +08:00 |
|
|
|
31a36d55f4
|
修改jwt 定义
|
2023-03-14 14:50:53 +08:00 |
|
彭桃
|
d9c51368bc
|
1
|
2023-03-14 14:47:41 +08:00 |
|
monanxiao
|
5c8062c1f9
|
更新接口验证方式，统一改为：$this->request->参数
|
2023-03-08 16:37:44 +08:00 |
|
monanxiao
|
da33dffa5a
|
JWT_UID 去除，更换为$this->rquest->uid
|
2023-03-08 10:26:24 +08:00 |
|
liuxiaoquan
|
dac8701e95
|
删除api私有地区模型，并移到common
|
2023-03-03 09:57:39 +08:00 |
|
liuxiaoquan
|
074cd8949b
|
地区模型移动到common
|
2023-03-03 09:51:38 +08:00 |
|
liuxiaoquan
|
a73cfbccea
|
api地区联动文件替换
|
2023-03-02 18:19:52 +08:00 |
|
liuxiaoquan
|
83d0b5f05b
|
api添加地区模型
|
2023-03-02 18:13:42 +08:00 |
|
liuxiaoquan
|
07fb0a16df
|
更正房屋装修api:category_id关联
|
2023-03-01 11:16:53 +08:00 |
|
liuxiaoquan
|
31d386de5e
|
增加获取查询字段数量
|
2023-03-01 11:16:52 +08:00 |
|
彭桃
|
5492e6e26b
|
Merge branch 'master' of http://git.excellentkk.cn/mkm/nk-lihaink-cn
|
2023-03-01 09:06:33 +08:00 |
|
彭桃
|
9531c434dc
|
统计修改
|
2023-03-01 09:03:31 +08:00 |
|
liuxiaoquan
|
da228bda16
|
取消api获职字段限制
|
2023-02-28 17:12:05 +08:00 |
|
liuxiaoquan
|
02e8f5dbc8
|
Merge branch 'master' of git.excellentkk.cn:mkm/nk-lihaink-cn into lxq
Conflicts:
app/admin/controller/Index.php
app/admin/controller/nk/Article.php
app/admin/model/StoreProduct.php
app/admin/view/nk/slideinfo/add.html
app/admin/view/nk/slideinfo/edit.html
app/admin/view/store_product/add.html
app/admin/view/store_product/datalist.html
app/admin/view/store_product/edit.html
app/admin/view/store_product/read.html
app/api/controller/Article.php
app/api/controller/Slide.php
public/.htaccess
|
2023-02-28 15:58:53 +08:00 |
|
liuxiaoquan
|
f8c71c69d1
|
1.0
|
2023-02-28 15:44:15 +08:00 |
|
彭桃
|
5928111877
|
接口后台
|
2023-02-27 16:47:42 +08:00 |
|
彭桃
|
135e40382d
|
后台新增生活服务，新增轮播接口
|
2023-02-25 17:32:47 +08:00 |
|
彭桃
|
987ea31cb0
|
接口修改
|
2023-02-22 14:42:04 +08:00 |
|
彭桃
|
b4a2dd1446
|
新增商品管理
|
2023-02-21 17:03:11 +08:00 |
|
|
|
a1c32e2269
|
1
|
2023-02-21 11:33:08 +08:00 |
|
|
|
9d06cc9144
|
1
|
2023-02-21 09:45:58 +08:00 |
|
彭桃
|
05a8e7457d
|
绑定新增写入推广人
|
2023-02-18 16:48:05 +08:00 |
|
