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

云

4 天以前 31bb16817c3702b4515a05e010dffa8b490c83b6

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

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