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

maven

10 天以前 b00f8a0bdccf0b0eed36f550e2c00176bfafe23f

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

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