Merge remote-tracking branch 'origin/dev_dingV1' into dev_dingV1

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ProcessListResultDTOBak.java

@@ -34,5 +34,6 @@ public class ProcessListResultDTOBak {
      * 进展id（操作记录表id）
      */
     private String processId;
+    private String type;
 }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -1287,6 +1287,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 eventProcess.setProcessTime(issueProcess.getProcessTime());
                 eventProcess.setPublicReply(issueProcess.getProgressDesc());
                 eventProcess.setIssueId(issueAdvanceResDTO.getIssueId());
+                eventProcess.setType(issueProcess.getType());
                 resultList.add(eventProcess);
             }
         }