Merge remote-tracking branch 'origin/master'

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java

@@ -27,4 +27,6 @@ public class DataUpload extends EntityData{
 	private String vordmId;
 
 	private String geometry;
+
+	private String uploaderEmail;
 }

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml

@@ -42,7 +42,8 @@
             ed.status,ed.uploader_id,ed.manager_id,
             ed.review_time, ed.source_organization,
             ed.upload_type,
-            bu.name as uploaderName
+            bu.name as uploaderName,
+            bu.email as uploaderEmail
         from entity_data ed
         left join blade_user bu on bu.id = ed.uploader_id
         <where>

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml

@@ -887,6 +887,7 @@
             gmdr.manager_id = #{userId}
         </where>
     </select>
+
     <select id="getUserDisasterInfoListNDRNew" resultType="com.kening.vordm.entity.DisasterInfo">
         select
         <include refid="Base_Column_List"/>