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

yuan

7 天以前 86b776e14070d7e00471b591a5325104772e7fc4

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

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