Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_...

zouyu

4 天以前 8f98ff2e202e5d7a39be484753db63d0165d70d7

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

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