Commit Graph

200 Commits

Author SHA1 Message Date
why 5df7af2170 密码修改 2023-04-20 14:21:05 +08:00
glj 7a42e21897 glj-代码提交 2023-04-20 14:20:52 +08:00
why ee21da44a6 Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend into why 2023-04-20 10:50: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 fc6e0ba6b1 Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend into why 2023-04-19 18:36:55 +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