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

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PublicAndInternalFileResultDTO.java

@@ -44,6 +44,12 @@ public class PublicAndInternalFileResultDTO implements Serializable {
      */
     private Integer duration;
 
+    /**
+     * 附件ID
+     */
+    @JsonIgnore
+    private String attachmentId;
+
     @JsonIgnore
     private String processId;
 

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessAttachmentDao.xml

@@ -6,6 +6,7 @@
     <!-- 根据项目ID查询附件 -->
     <select id="selectAttachByProjectId" resultType="com.epmet.dto.result.PublicAndInternalFileResultDTO">
         SELECT
+            ID AS attachmentId,
             FILE_NAME AS name,
             ATTACHMENT_URL AS url,
             ATTACHMENT_TYPE AS type,