Merge branch 'master' of http://47.92.168.204:3000/VoRDM/vordm-backend
This commit is contained in:
commit
eb9de1cbf9
|
@ -16,4 +16,8 @@ public class AdminManager extends DisasterInfo{
|
||||||
private Long managerId;
|
private Long managerId;
|
||||||
|
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
|
private String occupation;
|
||||||
|
|
||||||
|
private String researchField;
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,6 +27,8 @@
|
||||||
gmdr.response_organization,
|
gmdr.response_organization,
|
||||||
gmdr.status,
|
gmdr.status,
|
||||||
bu.name as managerName,
|
bu.name as managerName,
|
||||||
|
bu.research_field as researchField,
|
||||||
|
bu.occupation,
|
||||||
bdb.dict_value as disasterType,
|
bdb.dict_value as disasterType,
|
||||||
di.disaster_keyword,
|
di.disaster_keyword,
|
||||||
di.disaster_time,
|
di.disaster_time,
|
||||||
|
|
Loading…
Reference in New Issue