Merge remote-tracking branch 'origin/master'

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

@@ -17,7 +17,7 @@ public class EpdcScreenIssueProgressFormDTO implements Serializable {
     private String id;
 
     /**
-     * 0-项目ID，1-事件ID
+     * 0-项目ID，1-事件ID，2-议题ID
      */
     @NotBlank(message = "ID标识不能为空")
     private String idFlag;

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

@@ -118,4 +118,9 @@ public class UploadProjectInfoDTO implements Serializable {
      * 满意度得分
      */
     private Integer satisfactionScore;
+
+    /**
+     * 项目创建人ID
+     */
+    private String projectCreator;
 }