Merge branch 'hxsj' of http://114.132.189.42:9002/r/product-inventory-manag...

huminmin

7 天以前 4f74481c9091b217bf63e3eb8fb014ea39022644

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

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