Merge branch 'master' of http://121.42.41.42:7070/r/epdc-cloud-client-yushan

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

@@ -13,6 +13,16 @@ import java.io.Serializable;
 public class EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO implements Serializable {
     private static final long serialVersionUID = 384387846764695874L;
 
+    /**
+     * 3-12岁数量
+     */
+    private int ageThreeTwelve;
+
+    /**
+     *13-17岁数量
+     */
+    private int ageThirteenSeventeen;
+
     /**
      *18-30岁数量
      */

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

@@ -79,6 +79,11 @@ public class UploadProjectInfoDTO implements Serializable {
      */
     private String allCategoryName;
 
+    /**
+     * 所属类别编码
+     */
+    private String categoryCode;
+
     /**
      * 经度
      */