316 Commits

Author SHA1 Message Date
彭桃
c83b0ff5cf Merge branch 'master' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn 2023-02-09 11:14:27 +08:00
彭桃
d01e2d8238 接口修改1 2023-02-09 11:14:12 +08:00
mkm
72e30ef1c2 更新2 2023-02-09 09:02:38 +08:00
彭桃
7fa82136c5 3 2023-02-08 17:55:19 +08:00
彭桃
60809104a8 2 2023-02-08 17:43:16 +08:00
彭桃
9c2174fb0d Merge branch 'master' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn 2023-02-08 17:32:34 +08:00
彭桃
d8f4004f24 1 2023-02-08 17:32:05 +08:00
mkm
fbc9c99129 Merge remote-tracking branch 'origin/master' 2023-02-08 17:30:33 +08:00
彭桃
61caa3a66e 镇管理 2023-02-08 17:19:58 +08:00
mkm
ffa60a915c Merge remote-tracking branch 'origin/master' 2023-02-08 16:44:50 +08:00
彭桃
936cd5d648 接口修改1 2023-02-08 16:43:51 +08:00
彭桃
443d08670a 新增我的镇接口 2023-02-08 16:36:29 +08:00
mkm
18f9e1bb1f Merge branch 'master' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn 2023-02-07 17:40:38 +08:00
彭桃
f14dfa2eca 11 2023-02-07 17:38:12 +08:00
mkm
02fc8cd80b Merge remote-tracking branch 'origin/development' 2023-02-07 17:16:39 +08:00
ba631319b2
!4 1
Merge pull request !4 from 入门到放弃/development
2023-02-07 09:14:58 +00:00
mkm
d1795b0e12 提交1 2023-02-07 09:14:39 +00:00
mkm
4056810d0e 更新权限 2023-02-07 09:14:39 +00:00
mkm
ee79513c57 更新 2023-02-07 09:14:39 +00:00
彭桃
2417f63729 后台产品情况管理 2023-02-07 17:10:23 +08:00
mkm
ca56253bc4 提交1 2023-02-07 17:06:28 +08:00
mkm
f62384cf8e 更新权限 2023-02-06 17:50:51 +08:00
彭桃
d44c1db4cf 后台农贸市场、蔬菜基地、产品情况、农产品结构 2023-02-06 17:40:56 +08:00
mkm
7b593aea1f 更新 2023-02-06 14:35:11 +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
mkm
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
彭桃
370f26fe70 接口修改6 2023-02-02 16:51:46 +08:00
彭桃
d9109a5f24 接口修改5 2023-02-02 15:07:02 +08:00
彭桃
ae7537a62a 接口修改4 2023-02-02 14:49:06 +08:00
彭桃
f1279af860 接口修改3 2023-02-02 14:30:47 +08:00
彭桃
a2ac35d730 接口修改3 2023-02-02 14:14:58 +08:00
彭桃
3b5a892c75 接口修改2 2023-02-02 14:05:59 +08:00
mkm
98be87856a Merge remote-tracking branch 'origin/master' 2023-02-02 11:56:26 +08:00
mkm
dda7d87b29 修复注册用户录入错误 2023-02-02 11:56:19 +08:00
彭桃
7a0f015995 接口修改1 2023-02-02 11:08:58 +08:00
彭桃
3a628c3ca4 点赞村庄 2023-02-02 10:58:44 +08:00
彭桃
66784bc0b3 文章评论、投诉管理 2023-02-01 16:52:28 +08:00
mkm
c580709bb2 Merge remote-tracking branch 'origin/master' 2023-02-01 15:28:59 +08:00
mkm
0f4bf5ee80 更新2 2023-02-01 15:28:48 +08:00
彭桃
25e2daafc0 后台分类管理、自治管理,接口修改 2023-02-01 11:30:54 +08:00
彭桃
fedb471f5f 3 2023-01-31 17:14:37 +08:00
彭桃
e5bbe5dbaa 接口修改5 2023-01-31 17:12:05 +08:00
彭桃
b3cdc4f743 接口修改4 2023-01-31 17:09:14 +08:00
彭桃
62a174c0d9 Merge branch 'master' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn
# Conflicts:
#	app/admin/controller/Api.php
2023-01-31 16:42:20 +08:00
彭桃
8e965f92bc 后台消息通知、党务管理 2023-01-31 16:39:11 +08:00
mkm
e5c1061559 更新1 2023-01-31 15:53:11 +08:00
mkm
c278ef711f Merge remote-tracking branch 'origin/master' 2023-01-31 14:48:58 +08:00