72 Commits

Author SHA1 Message Date
liuxiaoquan
440d98ddb4 更新本地master 2023-03-02 20:21:51 +08:00
liuxiaoquan
6d3daa13eb 新增文娱旅游、教育培训、民生公益、房屋装修后台功能与api文件 2023-03-01 19:48:20 +08:00
liuxiaoquan
7f2ff527ab 没什么改动 2023-03-01 11:36:26 +08:00
liuxiaoquan
4ffecc59da 更改公益活动url格式 2023-03-01 11:31:20 +08:00
liuxiaoquan
b7b2353591 修改表名 2023-03-01 11:16:52 +08:00
liuxiaoquan
46c9611d48 纠正查询表名 2023-03-01 11:16:52 +08:00
liuxiaoquan
97de6285d1 修改url大小写问题 2023-02-28 17:33:29 +08:00
liuxiaoquan
03a880d3a0 修改url大小写问题 2023-02-28 16:48:31 +08:00
liuxiaoquan
a21bd3bddf 修改url大小写问题 2023-02-28 16:40:57 +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
彭桃
8eb1087997 1 2023-02-28 10:44:09 +08:00
彭桃
5928111877 接口后台 2023-02-27 16:47:42 +08:00
彭桃
135e40382d 后台新增生活服务,新增轮播接口 2023-02-25 17:32:47 +08:00
mkm
e95a7d3b64 接口修改11 2023-02-18 10:40:46 +08:00
mkm
cf81c9f4eb 接口修改8 2023-02-14 19:17:00 +08:00
彭桃
b767bff804 后台修改 2023-02-14 17:31:53 +08:00
mkm
21afb048de 接口修改7 2023-02-14 11:13:43 +08:00
彭桃
6a57f4c5f3 接口后台修改3 2023-02-14 10:53:17 +08:00
彭桃
517c078f86 后台修改1 2023-02-14 10:22:19 +08:00
彭桃
c39740a07e 1 2023-02-13 17:23:41 +08:00
彭桃
71c6c1208a 后台修改1 2023-02-13 17:18:42 +08:00
彭桃
78ed2babc3 接口修改6 2023-02-13 14:36:25 +08:00
0119afc874 更新 2023-02-12 11:15:14 +08:00
彭桃
a508227a84 后台修改 2023-02-11 17:11:44 +08:00
彭桃
eef5e6b3d1 接口、后台修改5 2023-02-11 11:42:42 +08:00
mkm
7854e0b1b7 Merge remote-tracking branch 'origin/master' 2023-02-11 11:02:57 +08:00
mkm
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
mkm
72d4462e86 更新3 2023-02-10 17:39:45 +08:00
彭桃
2a38a6f1d2 接口修改6 2023-02-10 16:37:18 +08:00
彭桃
503c1d1130 后台修改1 2023-02-10 14:21:31 +08:00
彭桃
3f74264007 直播管理 2023-02-10 14:07:20 +08:00
彭桃
bb9709be3f 接口修改2 2023-02-10 13:48:26 +08:00
彭桃
6b2f937ff1 文章相关 2023-02-09 18:03:52 +08:00
彭桃
c0e0b993de 数据接口 2023-02-09 17:25:11 +08:00
彭桃
d6f985b808 111 2023-02-09 16:33:35 +08:00
彭桃
daae63614b 1 2023-02-09 14:32:32 +08:00
mkm
72e30ef1c2 更新2 2023-02-09 09:02:38 +08:00
彭桃
60809104a8 2 2023-02-08 17:43:16 +08:00
彭桃
d8f4004f24 1 2023-02-08 17:32:05 +08:00
彭桃
61caa3a66e 镇管理 2023-02-08 17:19:58 +08:00
mkm
d1795b0e12 提交1 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
彭桃
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