Merge remote-tracking branch 'origin/master'

epdc-cloud-admin-client/src/main/java/com/elink/esua/epdc/dto/PartyOrgTypeDTO.java

@@ -88,4 +88,9 @@ public class PartyOrgTypeDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 党组织类型图标
+     */
+	private String imgUrl;
+
 }

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgResultDTO.java

@@ -52,4 +52,9 @@ public class EpdcScreenPartyBuildingPartyOrgResultDTO implements Serializable {
      */
     private  String typeCode;
 
+    /**
+     *党组织类型图标
+     */
+    private  String imgUrl;
+
 }

epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenPartyBuildingPartyOrgTypeResultDTO.java

@@ -32,4 +32,9 @@ public class EpdcScreenPartyBuildingPartyOrgTypeResultDTO implements Serializabl
      */
     private String typeCode;
 
+    /**
+     *党组织类型图标
+     */
+    private  String imgUrl;
+
 }

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/PersonTestingPageDTO.java

@@ -0,0 +1,113 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @program: epdc-cloud-custom-yushan
+ * @description:
+ * @author: wangtong
+ * @create: 2021-08-21 14:01
+ **/
+@Data
+public class PersonTestingPageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 出生日期
+     */
+    private String birthday;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 住址
+     */
+    private String address;
+
+    /**
+     * 身份证号码
+     */
+    private String idcard;
+
+    /**
+     * 签发机关
+     */
+    private String organ;
+
+    /**
+     * 照片base64编码
+     */
+    private String imgCode;
+
+    /**
+     * 照片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 核酸接测结果
+     */
+    private String testingResult;
+
+    /**
+     * 核酸检测时间
+     */
+    private String testingTime;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 逻辑删除标识
+     */
+    private String delFlag;
+}