Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend

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;
 }

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,