Merge branch 'dev_tide' into dev_tide_gybjyhglxt

zouyu

2 天以前 0b0b8419586505154a7e57e7c32c9a44329347ce

 src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java

@@ -56,6 +56,7 @@
    /**
     * 过期时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date expirationDate;