glj
|
e1617f1659
|
Merge branch 'why' into glj
|
2023-04-20 09:06:32 +08:00 |
|
glj
|
559553b29d
|
代码提交
|
2023-04-20 09:04:40 +08:00 |
yyhouc
|
e18b864ee3
|
完成tool 修复，完成contact 完成 数据审核加入分配
|
2023-04-19 21:00:42 +08:00 |
 王洪庆
|
9e4e7c1ba2
|
Dockerfile
|
2023-04-19 19:08:51 +08:00 |
|
王洪庆
|
57f56c4d92
|
Dockerfile
|
2023-04-19 19:05:19 +08:00 |
|
王洪庆
|
9abf5b429e
|
爬虫代理服务
|
2023-04-19 19:01:07 +08:00 |
why
|
260eb3acd9
|
个人中心
|
2023-04-19 18:36:38 +08:00 |
|
glj
|
4c3c54e585
|
glj-代码提交
|
2023-04-19 18:35:02 +08:00 |
|
glj
|
c342307ac1
|
Merge branch 'why'
|
2023-04-19 10:40:17 +08:00 |
|
why
|
3701e67719
|
1
|
2023-04-19 10:38:10 +08:00 |
|
glj
|
f47f07dabc
|
代码提交-glj
|
2023-04-19 10:37:03 +08:00 |
|
glj
|
f71755741f
|
代码提交-glj
|
2023-04-18 21:08:58 +08:00 |
|
why
|
18f5fc2a6b
|
1
|
2023-04-18 16:57:05 +08:00 |
|
glj
|
51136e2658
|
代码冲突解决
|
2023-04-18 10:11:05 +08:00 |
|
why
|
f5427555d8
|
解决问题
|
2023-04-18 10:08:49 +08:00 |
|
glj
|
16eedaf39c
|
Merge branch 'glj' of http://47.92.168.204:3000/VoRDM/vordm-backend into glj
|
2023-04-18 10:02:44 +08:00 |
|
glj
|
d0218aec06
|
glj-代码提交
|
2023-04-18 10:02:27 +08:00 |
 李宇辰
|
742827006e
|
修改首页统计查询条件-liyuchen
|
2023-04-17 18:08:34 +08:00 |
|
李宇辰
|
cfc85721db
|
提交管理员管理灾害代码-liyuchen
|
2023-04-17 17:18:32 +08:00 |
刘旋
|
0339a8d060
|
.
|
2023-04-17 14:57:52 +08:00 |
|
李宇辰
|
78a8d14a18
|
Merge remote-tracking branch 'origin/master'
|
2023-04-17 13:56:52 +08:00 |
|
李宇辰
|
eb9d8526eb
|
首页统计添加过滤条件避免key为null的错误-liyuchen
|
2023-04-17 13:56:36 +08:00 |
|
glj
|
eb9de1cbf9
|
Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend
|
2023-04-17 13:50:39 +08:00 |
|
glj
|
b4ac00a073
|
代码提交
|
2023-04-17 13:50:25 +08:00 |
|
李宇辰
|
908feef7c5
|
修改普通管理员列表字段-liyuchen
|
2023-04-17 13:47:08 +08:00 |
|
glj
|
7bd9f4a8de
|
Merge branch 'glj' of http://47.92.168.204:3000/VoRDM/vordm-backend into glj
|
2023-04-17 09:33:58 +08:00 |
|
glj
|
2a40e0d3b2
|
冲突解决
|
2023-04-17 09:33:40 +08:00 |
|
李宇辰
|
4ea1014147
|
Merge branch 'yyhouc'
|
2023-04-17 09:13:56 +08:00 |
|
yyhouc
|
55bbcc2ee0
|
完成data数据审核
|
2023-04-17 09:07:18 +08:00 |
qqGroup0
|
29a9ab286b
|
Merge branch 'glj' of http://47.92.168.204:3000/VoRDM/vordm-backend into glj
|
2023-04-15 19:30:41 +08:00 |
|
glj
|
bbfb15fc3c
|
代码提交
|
2023-04-15 17:33:41 +08:00 |
|
李宇辰
|
b8e97e3b94
|
提交首页灾害统计代码-liyuchen
|
2023-04-15 17:09:45 +08:00 |
|
qqGroup0
|
a2cef7a947
|
Merge branch 'glj' of http://47.92.168.204:3000/VoRDM/vordm-backend into glj
|
2023-04-15 16:32:57 +08:00 |
|
qqGroup0
|
bf2b77b657
|
zqq:遥感影像接口
|
2023-04-15 16:32:04 +08:00 |
|
李宇辰
|
a8a9141684
|
将邮件的跳转地址移到application.yml中-liyuchen
|
2023-04-14 18:58:09 +08:00 |
|
李宇辰
|
1e90af8dca
|
修改chief管理员的租户查询-liyuchen
|
2023-04-14 18:28:48 +08:00 |
|
yyhouc
|
033da7dc22
|
完成contact
|
2023-04-14 18:05:15 +08:00 |
|
李宇辰
|
5abcf7ada1
|
修改批量删除和批量审核功能-liyuchen
|
2023-04-14 17:01:43 +08:00 |
|
李宇辰
|
4d0aeb8bc6
|
Merge branch 'yyhouc'
# Conflicts:
# kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
|
2023-04-14 09:31:39 +08:00 |
|
李宇辰
|
73ec8630cf
|
Merge remote-tracking branch 'origin/master'
|
2023-04-14 09:26:24 +08:00 |
|
李宇辰
|
2af85006c6
|
添加模板邮件-liyuchen
|
2023-04-14 09:25:59 +08:00 |
|
glj
|
a088cafacc
|
Merge branch 'glj'
|
2023-04-14 09:20:23 +08:00 |
|
glj
|
077e9b9d1d
|
冲突解决
|
2023-04-14 09:17:31 +08:00 |
|
yyhouc
|
e6b194859f
|
修改tool
|
2023-04-14 09:17:01 +08:00 |
|
李宇辰
|
c60c1b4d9c
|
Merge branch 'glj'
|
2023-04-13 20:10:58 +08:00 |
|
glj
|
c43dc6c2d0
|
glj-代码提交 邮件发送
|
2023-04-13 20:07:51 +08:00 |
|
李宇辰
|
f8f12e35e8
|
Merge branch 'glj'
|
2023-04-13 19:57:28 +08:00 |
|
glj
|
1628da591b
|
glj-代码提交
|
2023-04-13 19:50:46 +08:00 |
|
李宇辰
|
7aded22ada
|
提交图片、其他数据、词云的功能-liyuchen
|
2023-04-13 19:49:06 +08:00 |
|
qqGroup0
|
6b3056fd08
|
Merge remote-tracking branch 'origin/glj' into glj
|
2023-04-12 13:45:58 +08:00 |
|
glj
|
7963bb8a14
|
Merge branch 'glj'
|
2023-04-12 12:43:11 +08:00 |
|
why
|
c5ab81243c
|
1
|
2023-04-12 12:42:02 +08:00 |
|
qqGroup0
|
17834d5aa6
|
Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend into glj
|
2023-04-12 11:17:25 +08:00 |
|
glj
|
439432516f
|
冲突解决
|
2023-04-12 11:14:30 +08:00 |
|
glj
|
623ffe1a49
|
1
|
2023-04-12 11:10:57 +08:00 |
|
yyhouc
|
fda7574e46
|
修复前端部分显示异常，添加根据提交时间倒序排序
|
2023-04-12 10:16:59 +08:00 |
|
李宇辰
|
89aaa6508a
|
修改普通管理员查询-liyuchen
|
2023-04-12 10:09:44 +08:00 |
|
李宇辰
|
ab28ab3b9c
|
提交管理员审核功能-liyuchen
|
2023-04-12 09:22:51 +08:00 |
|
glj
|
b7510eb960
|
冲突解决
|
2023-04-12 09:20:46 +08:00 |
|
glj
|
af0f3f42ef
|
冲突解决
|
2023-04-12 09:16:55 +08:00 |
|
yyhouc
|
bc575f6bcb
|
提交callforhelp等
|
2023-04-12 09:08:25 +08:00 |
|
glj
|
a9831c97ee
|
Merge branch 'glj' of http://47.92.168.204:3000/VoRDM/vordm-backend into glj
|
2023-04-12 08:59:08 +08:00 |
|
glj
|
7ce3f7395c
|
代码提交
|
2023-04-12 08:58:55 +08:00 |
|
qqGroup0
|
e0b50eeb08
|
zqq:多条件检索
|
2023-04-11 22:33:30 +08:00 |
|
why
|
e07cd593bb
|
1
|
2023-04-11 21:46:08 +08:00 |
glj
|
927f60c521
|
Merge branch 'why' into glj
|
2023-04-11 18:48:27 +08:00 |
|
why
|
694b6e48cf
|
列表
|
2023-04-11 18:47:32 +08:00 |
|
glj
|
54be606916
|
代码提交
|
2023-04-11 17:57:43 +08:00 |
|
glj
|
6c7048cb95
|
代码提交
|
2023-04-11 16:22:28 +08:00 |
|
why
|
5caa9af6c3
|
Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend into why
|
2023-04-11 10:02:15 +08:00 |
|
why
|
bd24c62566
|
1
|
2023-04-11 10:02:03 +08:00 |
|
qqGroup0
|
9d750f10d6
|
冲突解决
|
2023-04-11 09:51:08 +08:00 |
|
qqGroup0
|
061311c9a1
|
1
|
2023-04-11 09:49:30 +08:00 |
|
qqGroup0
|
47e97a8df9
|
zqq:代码提交
|
2023-04-11 09:48:56 +08:00 |
|
glj
|
c349f3517c
|
代码合并冲突解决
|
2023-04-11 09:34:42 +08:00 |
|
qqGroup0
|
95e05c1c1e
|
Merge remote-tracking branch 'origin/glj' into glj
|
2023-04-11 09:32:28 +08:00 |
|
glj
|
36cac4f334
|
代码提交
|
2023-04-11 09:31:34 +08:00 |
|
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 |
|
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
|
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 |
|
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 |
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 |
|
王洪庆
|
385991d2e3
|
news demo
|
2023-03-31 18:23:40 +08:00 |
|
zhang-962464
|
7f3cf89cce
|
单表与多表数据获取示例
|
2023-03-31 17:29:18 +08:00 |
|
王洪庆
|
ce382d9c2c
|
验证码校验接口
|
2023-03-31 14:11:29 +08:00 |
|
zhang-962464
|
3059bca1b7
|
Merge remote-tracking branch 'origin/main'
|
2023-03-31 11:36:07 +08:00 |
|
zhang-962464
|
706b65b340
|
修改disaster_id为vordm_id
|
2023-03-31 10:52:25 +08:00 |
|
王洪庆
|
946a7a317c
|
demo
|
2023-03-31 10:35:22 +08:00 |
|
glj
|
4f11745b22
|
代码提交-表生成
|
2023-03-30 18:04:35 +08:00 |
|
glj
|
6e8915a514
|
代码提交——表生成
|
2023-03-30 18:04:03 +08:00 |
|
glj
|
7fc1ca4497
|
代码提交
|
2023-03-22 18:42:48 +08:00 |
|
glj
|
56ba411486
|
基本类型生成
|
2023-03-21 16:28:01 +08:00 |
|
王洪庆
|
e3e2c0566a
|
初始化项目
|
2023-03-21 15:11:58 +08:00 |