Merge remote-tracking branch 'origin/master'

# Conflicts:
#	epdc-cloud-analysis-pc-client/src/main/java/com/elink/esua/epdc/dto/analysis/pc/screen/result/EpdcScreenFrontPageHouseTypeStatisticsResultDTO.java

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.form;
 
+import lombok.Data;
+
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -8,6 +10,7 @@ import java.io.Serializable;
  * description: 疫情防控-社区接种情况统计发送报文对象
  * create time: 2021/8/12 9:37
  */
+@Data
 public class EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO implements Serializable {
 
     private static final long serialVersionUID = 8426177280387327056L;

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.form;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -7,6 +9,7 @@ import java.io.Serializable;
  * description: 疫情防控-疫苗接种年龄分布
  * create time: 2021/8/12$ 11:44$
  */
+@Data
 public class EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO implements Serializable {
     private static final long serialVersionUID = 7178548351741272048L;
 

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.form;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -7,6 +9,7 @@ import java.io.Serializable;
  * description: 疫情防控-疫苗接种人口类型统计
  * create time: 2021/8/12$ 15:06$
  */
+@Data
 public class EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO implements Serializable {
     private static final long serialVersionUID = 1121540449018270861L;
 

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -7,6 +9,7 @@ import java.io.Serializable;
  * description: 疫情防控-社区接种情况统计返回报文对象
  * create time: 2021/8/12$ 9:47$
  */
+@Data
 public class EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO implements Serializable {
     private static final long serialVersionUID = 6518369041204309304L;
 

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -7,6 +9,7 @@ import java.io.Serializable;
  * description: 疫情防控-接种企业统计
  * create time: 2021/8/12$ 11:07$
  */
+@Data
 public class EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO implements Serializable {
     private static final long serialVersionUID = 6150812960272566029L;
 

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -7,6 +9,7 @@ import java.io.Serializable;
  * description: 疫情防控-疫苗接种情况对象
  * create time: 2021/8/11$ 21:00$
  */
+@Data
 public class EpdcScreenEpidemicVaccinationStatisticsResultDTO implements Serializable {
     private static final long serialVersionUID = -5752368085842150107L;
 

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -7,6 +9,7 @@ import java.io.Serializable;
  * description: TODO
  * create time: 2021/8/11 19:31
  */
+@Data
 public class EpdcScreenFrontPageHouseTypeStatisticsResultDTO implements Serializable {
     private static final long serialVersionUID = -1606806297838110267L;
 

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -7,6 +9,7 @@ import java.io.Serializable;
  * description: 首页-人口类型统计对象
  * create time: 2021/8/11 17:07
  */
+@Data
 public class EpdcScreenFrontPagePersonInfoStatisticsResultDTO implements Serializable {
 
     private static final long serialVersionUID = -8067459990495551258L;

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -7,6 +9,7 @@ import java.io.Serializable;
  * description: 疫情防控-疫苗接种年龄分布
  * create time: 2021/8/12$ 11:38$
  */
+@Data
 public class EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO implements Serializable {
     private static final long serialVersionUID = 384387846764695874L;
 

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

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.analysis.pc.screen.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -7,6 +9,7 @@ import java.io.Serializable;
  * description: 疫情防控-疫苗接种人口类型统计
  * create time: 2021/8/12$ 15:09$
  */
+@Data
 public class EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO implements Serializable {
     private static final long serialVersionUID = 1793226717515470009L;