426 Commits

Author SHA1 Message Date
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
mkm
0729a892e2 删除不用的控制器页面 2023-01-31 14:48:51 +08:00
彭桃
989a61db0a 接口修改2 2023-01-31 14:40:03 +08:00
mkm
fca5b79283 Merge remote-tracking branch 'origin/master' 2023-01-31 14:12:21 +08:00
mkm
d2043ba857 更新10 2023-01-31 14:12:14 +08:00
彭桃
f4ac21e478 接口修改1 2023-01-31 13:52:40 +08:00
mkm
45c5c75ae4 更新9 2023-01-31 13:51:13 +08:00
mkm
b2584194a3 Merge remote-tracking branch 'origin/master' 2023-01-31 11:45:12 +08:00
mkm
9af5e2d25e 更新8 2023-01-31 11:45:04 +08:00
彭桃
7b3783706d 1 2023-01-31 11:40:32 +08:00
彭桃
2769bf6035 文章接口修改 2023-01-31 11:26:07 +08:00
彭桃
b5d0b4e395 上传接口修改 2023-01-31 10:46:36 +08:00
彭桃
432e5b2568 接口优化 2023-01-31 10:29:46 +08:00
彭桃
13fb77f8dd 消息通知接口 2023-01-31 10:14:44 +08:00
彭桃
940e97680b 1 2023-01-30 18:00:21 +08:00
彭桃
eb514d4faf 123 2023-01-30 17:50:17 +08:00
彭桃
9e88a441d7 后台党务管理 2023-01-30 17:45:55 +08:00
彭桃
298aa92a7d 1 2023-01-30 17:33:14 +08:00
彭桃
260a4f3f51 111 2023-01-30 17:03:10 +08:00
mkm
4596616f99 Merge remote-tracking branch 'origin/master' 2023-01-30 16:33:11 +08:00
mkm
ce5ddb7e06 更新7 2023-01-30 16:33:01 +08:00
彭桃
8a88292b1b 联合查询写法修改 2023-01-30 10:02:23 +08:00
彭桃
4f510ae07a Merge branch 'master' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn 2023-01-30 09:41:22 +08:00
彭桃
fe215f32ab 统计不鉴权 2023-01-30 09:40:38 +08:00
彭桃
3c2960d222
!3 接口更新2
Merge pull request !3 from 彭桃/pt
2023-01-30 01:28:55 +00:00
彭桃
b83dadccff Merge branch 'pt' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn 2023-01-30 09:27:35 +08:00
彭桃
42073160d1 1 2023-01-30 09:23:59 +08:00
彭桃
09bfe58442 接口修改、后台农作物修改 2023-01-29 09:47:43 +00:00
彭桃
8b2f84f484 接口修改、后台农作物修改 2023-01-29 17:46:52 +08:00
mkm
ca2e14a6f5 Merge remote-tracking branch 'origin/master' 2023-01-29 17:23:39 +08:00
mkm
410114c2fd 更新6 2023-01-29 17:23:27 +08:00
82d85b5e3c
!2 接口更新
Merge pull request !2 from 彭桃/pt
2023-01-29 06:55:57 +00:00
mkm
f338916394 更新5 2023-01-29 14:13:54 +08:00
彭桃
31d0e910f7 接口 2023-01-29 14:11:57 +08:00
mkm
a7c538cea5 更新4 2023-01-29 11:21:27 +08:00
彭桃
1c17637059 接口更新 2023-01-29 10:54:25 +08:00
彭桃
887738fab7 Merge branch 'pt' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn
# Conflicts:
#	.gitignore
2023-01-29 09:19:22 +08:00
彭桃
defb92c12a 1 2023-01-29 09:17:31 +08:00
彭桃
ffa7ac18a4
update .gitignore.
Signed-off-by: 彭桃 <1098598843@qq.com>
2023-01-29 01:16:13 +00:00
彭桃
12289d5cb6 11 2023-01-29 09:16:06 +08:00
彭桃
663bfa10a2 Merge branch 'pt' of https://gitee.com/luzhou-lihai-agriculture/nk-lihaink-cn 2023-01-29 09:07:13 +08:00