Merge branch 'dev_tide' into dev_tide_sbjkxt

zouyu

3 天以前 633ec5aed640938430dba08b14b70b5fc3170dad

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

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