Commit Graph

69 Commits

Author SHA1 Message Date
glj c342307ac1 Merge branch 'why' 2023-04-19 10:40:17 +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 16eedaf39c Merge branch 'glj' of http://47.92.168.204:3000/VoRDM/vordm-backend into glj 2023-04-18 10:02:44 +08:00
李宇辰 cfc85721db 提交管理员管理灾害代码-liyuchen 2023-04-17 17:18:32 +08:00
刘旋 0339a8d060 . 2023-04-17 14:57:52 +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
李宇辰 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
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
李宇辰 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
李宇辰 2af85006c6 添加模板邮件-liyuchen 2023-04-14 09:25:59 +08:00
yyhouc e6b194859f 修改tool 2023-04-14 09:17:01 +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
glj 7963bb8a14 Merge branch 'glj' 2023-04-12 12:43:11 +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
李宇辰 89aaa6508a 修改普通管理员查询-liyuchen 2023-04-12 10:09:44 +08:00
李宇辰 ab28ab3b9c 提交管理员审核功能-liyuchen 2023-04-12 09:22:51 +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
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 6c7048cb95 代码提交 2023-04-11 16:22:28 +08:00
glj c349f3517c 代码合并冲突解决 2023-04-11 09:34:42 +08:00
why 622140bfd4 1 2023-04-11 09:11:59 +08:00
glj b23d0eb500 代码提交 2023-04-11 08:51:29 +08:00
why 609c82c13e 左边栏 2023-04-10 15:07:23 +08:00
glj ef795818c1 代码提交 2023-04-10 11:17:50 +08:00
glj 1abb487a79 代码提交 2023-04-10 09:51:54 +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
glj 2bb3d1eed9 代码提交 2023-04-07 18:13:22 +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
zxh c534592f95 增加了前端灾害数据的主页数据页面展示 2023-04-05 22:37:56 +08:00