Merge branch 'dev_tide_gybjyhglxt' into dev_tide_gybjyhglxt_xindao

zouyu

2026-01-10 0febd1ea7218cf2ae28cad07912bf6ba7b881d2c

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

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