429 Commits

Author SHA1 Message Date
liuxiaoquan
6d3daa13eb 新增文娱旅游、教育培训、民生公益、房屋装修后台功能与api文件 2023-03-01 19:48:20 +08:00
monanxiao
0f6bc586d2 增加财务相关模块 2023-03-01 16:27:44 +08:00
彭桃
b9b72a967a 1 2023-03-01 15:13:10 +08:00
liuxiaoquan
4ffecc59da 更改公益活动url格式 2023-03-01 11:31:20 +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
liuxiaoquan
b7b2353591 修改表名 2023-03-01 11:16:52 +08:00
liuxiaoquan
46c9611d48 纠正查询表名 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
97de6285d1 修改url大小写问题 2023-02-28 17:33:29 +08:00
liuxiaoquan
da228bda16 取消api获职字段限制 2023-02-28 17:12:05 +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
mkm
1e005a15c4 接口修改16 2023-02-28 13:57:54 +08:00
mkm
29629e840a 接口修改15 2023-02-28 12:25:04 +08:00
彭桃
8eb1087997 1 2023-02-28 10:44:09 +08:00
mkm
0e97bf08fb 接口修改14 2023-02-27 17:44:51 +08:00
mkm
6cd7393cd8 接口修改14 2023-02-27 17:43:22 +08:00
mkm
6d3ac63622 接口修改14 2023-02-27 17:42:22 +08:00
mkm
5be1a4b2c1 Merge remote-tracking branch 'bb/master' 2023-02-27 17:14:32 +08:00
mkm
02bdb10200 接口修改14 2023-02-27 17:14:21 +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
彭桃
165c641937 222 2023-02-22 17:23:56 +08:00
彭桃
a34d2e12d8 1111 2023-02-22 17:14:21 +08:00
彭桃
987ea31cb0 接口修改 2023-02-22 14:42:04 +08:00
彭桃
c6aba8f397 商品管理 2023-02-22 14:25:29 +08:00
彭桃
a631133b4c 商品多图上传 2023-02-22 11:51:55 +08:00
彭桃
b4a2dd1446 新增商品管理 2023-02-21 17:03:11 +08:00
mkm
a1c32e2269 1 2023-02-21 11:33:08 +08:00
mkm
9d06cc9144 1 2023-02-21 09:45:58 +08:00
彭桃
05a8e7457d 绑定新增写入推广人 2023-02-18 16:48:05 +08:00
彭桃
496967aaa9 新增接口 2023-02-18 11:42:53 +08:00
mkm
f58eb5a821 接口修改13 2023-02-18 10:52:45 +08:00
mkm
01f9b4b160 接口修改12 2023-02-18 10:50:24 +08:00
mkm
e95a7d3b64 接口修改11 2023-02-18 10:40:46 +08:00
彭桃
aef4f6f2ed 接口修改 2023-02-16 15:51:11 +08:00
彭桃
ec0310c906 接口修改 2023-02-16 14:04:41 +08:00
彭桃
b32432a372 接口修改6 2023-02-15 17:41:36 +08:00
彭桃
e79538f55b 接口修改3 2023-02-15 17:29:03 +08:00
彭桃
b1ba53c15a 接口修改3 2023-02-15 16:13:16 +08:00
彭桃
5826fe2607 12 2023-02-15 14:08:13 +08:00
彭桃
cc422bbaa2 Merge branch 'master' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn 2023-02-15 13:40:12 +08:00
彭桃
e1bba828d2 接口修改2 2023-02-15 13:39:52 +08:00
mkm
43ed390805 接口修改10 2023-02-15 13:38:19 +08:00
彭桃
9f1a87c01b 接口修改1 2023-02-15 11:34:18 +08:00