glj
|
badec7ed5e
|
glj-代码提交
|
2023-05-04 09:39:22 +08:00 |
|
glj
|
489a2a4f4d
|
冲突解决
|
2023-05-04 09:38:50 +08:00 |
|
glj
|
3328a49cee
|
glj-代码提交
|
2023-05-04 09:33:11 +08:00 |
 李宇辰
|
1e9dd8cda1
|
Merge remote-tracking branch 'origin/master'
|
2023-04-27 16:06:30 +08:00 |
|
李宇辰
|
e8d25dbaf6
|
修改查询条件-liyuchen
|
2023-04-27 16:06:13 +08:00 |
|
glj
|
e9d6776631
|
glj-代码提交
|
2023-04-26 18:31:39 +08:00 |
|
glj
|
6704340b46
|
冲突解决-glj
|
2023-04-26 18:07:47 +08:00 |
|
glj
|
628ae3a6a7
|
glj-代码提交
|
2023-04-26 18:06:30 +08:00 |
|
glj
|
eefa6d1330
|
Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend
|
2023-04-26 14:20:23 +08:00 |
|
glj
|
a64bc3de5e
|
代码提交
|
2023-04-26 14:20:08 +08:00 |
yyhouc
|
ce80f7fb7e
|
Merge branch 'master' into yyhouc
# Conflicts:
# kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java
|
2023-04-26 10:54:13 +08:00 |
why
|
d14e10d936
|
Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend
|
2023-04-26 10:48:58 +08:00 |
|
why
|
50a70ce9b7
|
bug修改
|
2023-04-26 10:48:26 +08:00 |
|
glj
|
1056c903fd
|
Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend
|
2023-04-25 18:34:42 +08:00 |
|
glj
|
2a46da88c6
|
glj-代码提交
|
2023-04-25 18:34:35 +08:00 |
|
李宇辰
|
839a033a64
|
修改灾害分页列表查询条件-liyuchen
|
2023-04-25 16:14:51 +08:00 |
|
glj
|
d7dc4eb2e1
|
glj-代码提交
|
2023-04-25 10:48:44 +08:00 |
|
glj
|
51f9a9e4e1
|
冲突解决
|
2023-04-25 10:47:23 +08:00 |
|
glj
|
6b3dc3554b
|
glj-代码提交
|
2023-04-25 10:37:43 +08:00 |
|
glj
|
78d40da6b8
|
Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend
|
2023-04-25 09:16:30 +08:00 |
|
glj
|
8be32612a5
|
glj-代码提交
|
2023-04-25 09:16:15 +08:00 |
 王洪庆
|
472d54963b
|
whq： 还原服务名称
|
2023-04-24 20:16:50 +08:00 |
|
王洪庆
|
cb44e02ef5
|
Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend
|
2023-04-24 20:11:57 +08:00 |
|
王洪庆
|
9648ec944b
|
Twitter
|
2023-04-24 19:59:47 +08:00 |
|
王洪庆
|
54ea3a9431
|
Twitter
|
2023-04-24 19:58:10 +08:00 |
|
王洪庆
|
890c26bfb5
|
Twitter
|
2023-04-24 19:55:20 +08:00 |
|
王洪庆
|
05fe6dd72f
|
Twitter
|
2023-04-24 19:28:56 +08:00 |
|
王洪庆
|
a5913eae41
|
Twitter
|
2023-04-24 19:28:36 +08:00 |
|
why
|
1c8d4fc090
|
Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend
|
2023-04-24 18:49:52 +08:00 |
|
why
|
41b5ef5719
|
控制台统计
|
2023-04-24 18:49:45 +08:00 |
|
glj
|
c0206ad1c2
|
glj-代码提交
|
2023-04-24 16:39:35 +08:00 |
|
glj
|
c13e038991
|
glj-代码提交
|
2023-04-24 15:49:52 +08:00 |
|
why
|
7b12cce404
|
个人中心修改
|
2023-04-24 15:34:50 +08:00 |
|
glj
|
ffc44eb0b6
|
代码提交-glj
|
2023-04-24 15:11:47 +08:00 |
|
glj
|
4b164610f2
|
代码提交
|
2023-04-24 10:42:45 +08:00 |
|
glj
|
0adf0e1113
|
代码提交
|
2023-04-21 19:37:17 +08:00 |
|
glj
|
ff7e4eabaa
|
冲突解决-glj
|
2023-04-21 18:35:58 +08:00 |
|
glj
|
945391f2e3
|
Merge branch 'yyhouc' of http://47.92.168.204:3000/VoRDM/vordm-backend into yyhouc
|
2023-04-21 18:30:44 +08:00 |
|
glj
|
4cf8423642
|
代码提交-glj
|
2023-04-21 18:23:52 +08:00 |
|
why
|
b5076f32d1
|
个人资料修改
|
2023-04-21 18:17:33 +08:00 |
|
yyhouc
|
6f10ac992b
|
完成爬虫后端服务管理，完成爬虫调用
|
2023-04-21 18:09:51 +08:00 |
|
glj
|
25ee39069e
|
代码提交-glj
|
2023-04-21 16:19:23 +08:00 |
|
why
|
f71c2f5bef
|
左侧统计
|
2023-04-20 17:45:33 +08:00 |
|
glj
|
633fa14a57
|
Merge branch 'why' into glj
|
2023-04-20 14:25:07 +08:00 |
|
why
|
5df7af2170
|
密码修改
|
2023-04-20 14:21:05 +08:00 |
|
glj
|
7a42e21897
|
glj-代码提交
|
2023-04-20 14:20:52 +08:00 |
|
王洪庆
|
836a19065c
|
删除无用代码
|
2023-04-20 09:32:37 +08:00 |
|
王洪庆
|
dd7769e216
|
Merge branch 'whq'
|
2023-04-20 09:30:07 +08:00 |
|
glj
|
3716fc1fb8
|
冲突解决
|
2023-04-20 09:19:09 +08:00 |
|
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 |
|
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
|
80146ae924
|
冲突解决
|
2023-04-06 18:22:40 +08:00 |
|
李宇辰
|
ec9a2e2474
|
提交多媒体页面导出功能-liyuchen
|
2023-04-06 17:30:04 +08:00 |