Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.dto.analysis.pc.screen.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * create by: zhangfenghe
+ * description: 疫情防控-疫苗接种情况请求对象
+ * create time: 2021/8/11$ 21:00$
+ */
+@Data
+public class EpdcScreenEpidemicVaccinationStatisticsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1007443787006330567L;
+
+    /**
+     * 组织类型：街道：street_party，社区：community_party
+     */
+    private String typeKey;
+}

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

@@ -12,6 +12,11 @@ import java.io.Serializable;
 public class EpdcScreenGridGovernanceItemDifficultResultDTO implements Serializable {
     private static final long serialVersionUID = 6811731619897514999L;
 
+    /**
+     * 项目ID
+     */
+    private String itemId;
+
     /**
      * 事件ID
      */