Commit Graph

313 Commits

Author SHA1 Message Date
glj b5236bbd92 代码提交 2023-04-11 09:26:00 +08:00
qqGroup0 6d33feb5d4 冲突解决 2023-04-11 09:20:50 +08:00
why 622140bfd4 1 2023-04-11 09:11:59 +08:00
glj b23d0eb500 代码提交 2023-04-11 08:51:29 +08:00
qqGroup0 7cadff6440 zqq:遥感影像检索 2023-04-11 00:04:19 +08:00
why 609c82c13e 左边栏 2023-04-10 15:07:23 +08:00
glj ef795818c1 代码提交 2023-04-10 11:17:50 +08:00
glj 08d2b53896 代码提交 2023-04-10 10:39:16 +08:00
glj 1abb487a79 代码提交 2023-04-10 09:51:54 +08:00
glj c6165debdc Merge branch 'why' into glj 2023-04-10 09:34:59 +08:00
glj 71e8901d55 代码提交 2023-04-10 09:33:48 +08:00
why ea517025f4 左边导航统计 2023-04-10 09:29:15 +08:00
glj 6b34f5cf18 代码提交 2023-04-10 09:22:20 +08:00
glj 725ab89e69 冲突解决 2023-04-08 15:26:46 +08:00
why d8846d4826 1 2023-04-08 15:11:47 +08:00
glj 715fceb042 代码提交 2023-04-08 14:52:17 +08:00
glj ad5de299c6 代码提交 2023-04-08 14:49:34 +08:00
glj 6ee282bd82 Merge branch 'master' into glj 2023-04-08 12:44:55 +08:00
yyhouc c1155f5570 完成字典完成 toolUpload contact 面向前端初步构建 2023-04-07 18:51:06 +08:00
why c9c43b1a93 首页功能 2023-04-07 18:42:48 +08:00
glj 2bb3d1eed9 代码提交 2023-04-07 18:13:22 +08:00
glj 2c4fae332e 代码提交 2023-04-07 11:40:36 +08:00
glj c69580c329 Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend 2023-04-07 09:06:57 +08:00
王洪庆 8787d469bf 合并分支并解决冲突 2023-04-06 18:34:36 +08:00
glj 80146ae924 冲突解决 2023-04-06 18:22:40 +08:00
李宇辰 ec9a2e2474 提交多媒体页面导出功能-liyuchen 2023-04-06 17:30:04 +08:00
glj 4805f36b22 代码提交 2023-04-06 17:25:23 +08:00
王洪庆 92b0a2952f 系统管理功能调整 2023-04-06 10:33:45 +08:00
王洪庆 0680c459af 用户信息调整 2023-04-06 10:26:30 +08:00
glj 233bdbf480 新建分支 2023-04-06 09:58:55 +08:00
glj e66ff3062a 代码提交 2023-04-06 09:53:57 +08:00
glj ab282be7a1 冲突解决 2023-04-06 09:53:02 +08:00
glj 14bdf16a95 代码提交 2023-04-06 09:46:21 +08:00
王洪庆 de6444c233 鉴权以及用户管理模块 2023-04-06 09:36:50 +08:00
王洪庆 b5e19e36cb 修改错误 2023-04-06 09:29:24 +08:00
zxh c534592f95 增加了前端灾害数据的主页数据页面展示 2023-04-05 22:37:56 +08:00
zxh ff04cc156a 增加了前端灾害数据的统计信息接口 2023-04-05 18:27:32 +08:00
李宇辰 39c3c6bcea 多媒体后台接口-liyuchen 2023-04-05 18:18:38 +08:00
zxh 392831be1e 遥感影像联动,以及数据查询 2023-04-05 17:42:10 +08:00
glj 6ead3b9add 代码提交 2023-04-05 17:29:16 +08:00
glj be7f0c29b5 代码提交 2023-04-05 17:27:43 +08:00
zxh 6420deef37 修改了影像的实体类型,添加了一半的筛选条件 2023-04-05 15:47:03 +08:00
qqGroup0 11814127d8 zqq:查询遥感影像元数据接口 2023-04-05 14:54:05 +08:00
glj 03e21c5f96 项目提交 2023-04-04 16:40:47 +08:00
glj a61d222a25 代码提交-项目实体更新 2023-04-04 16:23:25 +08:00
qqGroup a764a1d84d zqq:查询遥感影像数据 2023-04-03 11:24:07 +08:00
qqGroup0 e33447dbdf 查询遥感元数据就 2023-04-03 09:52:48 +08:00
qqGroup0 5e947b06d8 查询遥感元数据就 2023-04-03 09:49:55 +08:00
王洪庆 a10b8497da news demo 2023-03-31 18:33:24 +08:00
王洪庆 d634e1037c Merge remote-tracking branch 'origin/main'
# Conflicts:
#	kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.java
#	kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/NewsMapper.xml
#	kn-service/biz-vordm/src/main/java/com/kening/vordm/service/NewsService.java
#	kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/NewsServiceImpl.java
2023-03-31 18:24:27 +08:00