151 Commits

Author SHA1 Message Date
liuxiaoquan
b74ab2b198 更新本地旧代码 2023-03-03 19:33:24 +08:00
liuxiaoquan
89e73b8c49 商户管理的路由设置,商户菜单管理 2023-03-03 19:01:17 +08:00
liuxiaoquan
a6689b146e 店铺管理路由设置与商户菜单功能 2023-03-03 19:00:46 +08:00
liuxiaoquan
440d98ddb4 更新本地master 2023-03-02 20:21:51 +08:00
liuxiaoquan
16131e5668 api地区联动模型添加 2023-03-02 18:29:59 +08:00
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
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
mkm
1e005a15c4 接口修改16 2023-02-28 13:57:54 +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
彭桃
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
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
彭桃
79fe751dde 接口修改2 2023-02-14 10:00:52 +08:00
彭桃
c39740a07e 1 2023-02-13 17:23:41 +08:00
彭桃
71c6c1208a 后台修改1 2023-02-13 17:18:42 +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
彭桃
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