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

chenhj

5 天以前 f8e79ecd973b35e98bc189328c7efa3f88f10f02

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

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