Commit Graph

107 Commits

Author SHA1 Message Date
weiz 7e9930a444 新增数据监测项配置 2023-11-27 15:22:56 +08:00
weiz b4ebd357c2 fixed 2023-11-27 15:06:47 +08:00
weiz 85d7feffe4 Merge pull request '修改产品绑定逻辑' (#18) from zhangwei into dev
Reviewed-on: #18
2023-11-27 13:36:41 +08:00
weiz e746730d84 修改产品绑定逻辑 2023-11-27 13:35:55 +08:00
yaooo 13784d5d95 更新用户数据 2023-11-25 18:17:31 +08:00
yaooo 799331bf5f Merge branch 'yaooo' into dev 2023-11-25 18:14:27 +08:00
yaooo 4951519cc7 更新用户数据 2023-11-25 18:13:50 +08:00
weiz 1634bc32af Merge pull request 'delete no-use file' (#17) from zhangwei into dev
Reviewed-on: #17
2023-11-25 17:36:07 +08:00
weiz 1d4d5403b5 delete no-use file 2023-11-25 17:35:05 +08:00
weiz 823654a768 Merge pull request 'update' (#16) from zhangwei into dev
Reviewed-on: #16
2023-11-25 17:27:50 +08:00
weiz 7bbc063d5f update 2023-11-25 17:27:15 +08:00
yaooo ae0bc19500 更新用户数据 2023-11-25 15:48:26 +08:00
yaooo 1a7119f42a 更新静态文件 2023-11-25 14:28:04 +08:00
yaooo 5d382661f9 更新后台管理 2023-11-25 14:22:18 +08:00
yaooo 5b302e7fb5 更新后台管理 2023-11-25 14:06:30 +08:00
weiz 96b754ef4a Merge pull request 'update' (#15) from zhangwei into dev
Reviewed-on: #15
2023-11-25 13:43:18 +08:00
weiz 2c0a5ef054 update 2023-11-25 13:42:20 +08:00
yaooo 92497c8e41 更新后台管理 2023-11-25 11:15:39 +08:00
weiz 0932758165 Merge pull request '给相关内容添加user_id' (#14) from zhangwei into dev
Reviewed-on: #14
2023-11-25 11:04:45 +08:00
weiz af3b375156 给相关内容添加user_id 2023-11-25 11:04:14 +08:00
weiz cdeace5825 Merge pull request '更新首页接口' (#13) from zhangwei into dev
Reviewed-on: #13
2023-11-25 10:39:46 +08:00
weiz 129a96b082 更新首页接口 2023-11-25 10:39:21 +08:00
weiz 17d4f67339 Merge pull request '新增首页接口' (#12) from zhangwei into dev
Reviewed-on: #12
2023-11-25 10:35:47 +08:00
weiz 6be8667105 新增首页接口 2023-11-25 10:32:45 +08:00
weiz c132164e06 Merge pull request '图片上传' (#11) from zhangwei into dev
Reviewed-on: #11
2023-11-25 09:13:20 +08:00
weiz 67d830c567 图片上传 2023-11-25 09:12:25 +08:00
yaooo 4cc716312f 更新后台管理 2023-11-24 17:50:39 +08:00
yaooo 84d120bd4e 更新后台管理 2023-11-24 17:40:59 +08:00
yaooo 963ecaa64b 更新后台管理 2023-11-24 17:38:29 +08:00
yaooo 5f73210ce9 更新后台管理 2023-11-24 17:34:27 +08:00
yaooo 2a90a490be 新增设备管理模块 2023-11-24 16:09:15 +08:00
weiz 437ab872bd Merge pull request '新增设备绑定,土壤监测数据、空气监测数据、溯源二维码生成接口' (#10) from zhangwei into dev
Reviewed-on: #10
2023-11-24 15:03:12 +08:00
weiz a62c3425a2 新增设备绑定,土壤监测数据、空气监测数据、溯源二维码生成接口 2023-11-24 15:02:22 +08:00
yaooo fd0e8b3322 更新用户数据 2023-11-23 18:09:51 +08:00
yaooo 2ea80b15b1 更新土地操作 2023-11-23 17:32:03 +08:00
yaooo 56918bc1fb 更新土地操作 2023-11-23 17:28:57 +08:00
yaooo 49c0bbe837 更新土地操作 2023-11-23 17:26:14 +08:00
yaooo 8d1c86d475 更新静态工程 2023-11-23 14:38:54 +08:00
yaooo 69476ca917 更新静态工程 2023-11-23 14:33:56 +08:00
yaooo d42c6b42b8 更新土地种植 2023-11-23 14:22:11 +08:00
yaooo 6407746714 Merge branch 'yaooo' into dev 2023-11-23 14:16:26 +08:00
yaooo 1ff7ebdffe 更新土地种植 2023-11-23 14:15:41 +08:00
weiz 172a25320c Merge pull request '增加土地列表关键字搜索' (#9) from zhangwei into dev
Reviewed-on: #9
2023-11-23 13:39:23 +08:00
weiz 75122fffb6 增加土地列表关键字搜索 2023-11-23 13:38:46 +08:00
weiz 59dce7661f Merge pull request '新增土地列表、新增种植、种植列表、新增操作、操作列表接口' (#8) from zhangwei into dev
Reviewed-on: #8
2023-11-23 11:59:03 +08:00
weiz c82890dfc5 新增土地列表、新增种植、种植列表、新增操作、操作列表接口 2023-11-23 11:57:48 +08:00
yaooo 371161f979 更新土地管理 2023-11-23 11:18:28 +08:00
yaooo 109ca6137a 更新土地管理 2023-11-23 11:13:45 +08:00
yaooo 68951aabaf 解决冲突 2023-11-22 18:14:50 +08:00
yaooo a427b35865 更新忽略 2023-11-22 18:12:41 +08:00