Merge remote-tracking branch 'origin/dev_tide_cbsglxt' into dev_tide_cbsglx...

zouyu

2026-01-10 02f6d9e4d4f18060c41a7ea891c4c20adf92f335

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

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