liuxiaoquan
|
8cd4ef91f6
|
重新提交冲突文件
|
2023-03-16 12:18:52 +08:00 |
|
liuxiaoquan
|
223ac01453
|
变基：合并最新分支lxq
|
2023-03-16 11:45:33 +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 |
|
彭桃
|
a5bb34879e
|
1
|
2023-02-24 15:09:50 +08:00 |
|
|
|
01f9b4b160
|
接口修改12
|
2023-02-18 10:50:24 +08:00 |
|
|
|
e95a7d3b64
|
接口修改11
|
2023-02-18 10:40:46 +08:00 |
|
|
|
cf81c9f4eb
|
接口修改8
|
2023-02-14 19:17:00 +08:00 |
|
彭桃
|
b767bff804
|
后台修改
|
2023-02-14 17:31:53 +08:00 |
|
|
|
21afb048de
|
接口修改7
|
2023-02-14 11:13:43 +08:00 |
|
彭桃
|
517c078f86
|
后台修改1
|
2023-02-14 10:22:19 +08:00 |
|
彭桃
|
dc7f9280c7
|
接口修改7
|
2023-02-13 15:06:59 +08:00 |
|
彭桃
|
78ed2babc3
|
接口修改6
|
2023-02-13 14:36:25 +08:00 |
|
|
|
0119afc874
|
更新
|
2023-02-12 11:15:14 +08:00 |
|
彭桃
|
eef5e6b3d1
|
接口、后台修改5
|
2023-02-11 11:42:42 +08:00 |
|
|
|
7854e0b1b7
|
Merge remote-tracking branch 'origin/master'
|
2023-02-11 11:02:57 +08:00 |
|
|
|
14133b3d29
|
更新5
|
2023-02-11 11:02:45 +08:00 |
|
彭桃
|
f809051122
|
11
|
2023-02-11 10:41:57 +08:00 |
|
彭桃
|
0321de5bf8
|
Merge branch 'master' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn
|
2023-02-11 10:11:42 +08:00 |
|
彭桃
|
fb33499762
|
1
|
2023-02-11 10:11:28 +08:00 |
|
|
|
c132eb3197
|
更新4
|
2023-02-10 18:32:12 +08:00 |
|
|
|
72d4462e86
|
更新3
|
2023-02-10 17:39:45 +08:00 |
|
彭桃
|
c415cb8865
|
11
|
2023-02-10 15:28:19 +08:00 |
|
彭桃
|
3f74264007
|
直播管理
|
2023-02-10 14:07:20 +08:00 |
|
|
|
4c98be2a91
|
Merge remote-tracking branch 'origin/master'
|
2023-02-09 18:05:36 +08:00 |
|
|
|
9c7864f594
|
更新错误
|
2023-02-09 18:05:28 +08:00 |
|
彭桃
|
6b2f937ff1
|
文章相关
|
2023-02-09 18:03:52 +08:00 |
|
彭桃
|
c0e0b993de
|
数据接口
|
2023-02-09 17:25:11 +08:00 |
|
|
|
72e30ef1c2
|
更新2
|
2023-02-09 09:02:38 +08:00 |
|
彭桃
|
61caa3a66e
|
镇管理
|
2023-02-08 17:19:58 +08:00 |
|
|
|
d1795b0e12
|
提交1
|
2023-02-07 09:14:39 +00:00 |
|
|
|
4056810d0e
|
更新权限
|
2023-02-07 09:14:39 +00:00 |
|
|
|
ee79513c57
|
更新
|
2023-02-07 09:14:39 +00:00 |
|
彭桃
|
2417f63729
|
后台产品情况管理
|
2023-02-07 17:10:23 +08:00 |
|
彭桃
|
d44c1db4cf
|
后台农贸市场、蔬菜基地、产品情况、农产品结构
|
2023-02-06 17:40:56 +08:00 |
|
彭桃
|
e52e1fa1c3
|
Merge branch 'master' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn
# Conflicts:
# app/admin/controller/Index.php
# app/admin/view/index/main.html
|
2023-02-04 18:02:10 +08:00 |
|
彭桃
|
bb60b24a35
|
后台
|
2023-02-04 17:45:57 +08:00 |
|
|
|
30a3405562
|
更新
|
2023-02-04 16:48:12 +08:00 |
|
彭桃
|
cbeadb395b
|
村庄管理
|
2023-02-04 14:12:28 +08:00 |
|
彭桃
|
d679a2c884
|
新增实名认证接口，后台文章回复，文章评论管理，文章投诉管理，轮播图管理，实名认证管理
|
2023-02-03 11:21:28 +08:00 |
|
彭桃
|
66784bc0b3
|
文章评论、投诉管理
|
2023-02-01 16:52:28 +08:00 |
|
彭桃
|
25e2daafc0
|
后台分类管理、自治管理，接口修改
|
2023-02-01 11:30:54 +08:00 |
|
彭桃
|
8e965f92bc
|
后台消息通知、党务管理
|
2023-01-31 16:39:11 +08:00 |
|
|
|
d2043ba857
|
更新10
|
2023-01-31 14:12:14 +08:00 |
|
|
|
45c5c75ae4
|
更新9
|
2023-01-31 13:51:13 +08:00 |
|
|
|
b2584194a3
|
Merge remote-tracking branch 'origin/master'
|
2023-01-31 11:45:12 +08:00 |
|
|
|
9af5e2d25e
|
更新8
|
2023-01-31 11:45:04 +08:00 |
|
彭桃
|
9e88a441d7
|
后台党务管理
|
2023-01-30 17:45:55 +08:00 |
|
