From 908feef7c5a47dd042cd1268ad72f0a4226ca851 Mon Sep 17 00:00:00 2001
From: liyuchen <791867849@qq.com>
Date: Mon, 17 Apr 2023 13:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5-liyuchen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kening/vordm/entity/AdminManager.java   | 4 ++++
 .../com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java
index 94bb4de..f2c70a1 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java
@@ -16,4 +16,8 @@ public class AdminManager extends DisasterInfo{
 	private Long managerId;
 
 	private Integer status;
+
+	private String occupation;
+
+	private String researchField;
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
index e160756..6e51a5f 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
@@ -27,6 +27,8 @@
             gmdr.response_organization,
             gmdr.status,
             bu.name as managerName,
+            bu.research_field as researchField,
+            bu.occupation,
             bdb.dict_value as disasterType,
             di.disaster_keyword,
             di.disaster_time,