Merge branch 'dev_project_branch' into dev_temp

5 years ago · 4978a1a69d
3 changed files with 7 additions and 0 deletions
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PublicAndInternalFileResultDTO.java
+++ b/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;
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.6__create_project_attachment.sql
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.6__create_project_attachment.sql
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessAttachmentDao.xml
+++ b/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,