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

maven

9 天以前 dc3a872dd2f2cfcddd3db4e722efa376705482ec

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

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