Merge remote-tracking branch 'origin/master' into hckx

maven

2 天以前 3fd5bd656683c482141b13cfdb953d17ba377f1f

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

@@ -53,9 +53,11 @@
    @ApiModelProperty("优先级(1普通 2重要 3紧急)")
    private Integer priority;


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