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

maven

10 小时以前 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d

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

 src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java

@@ -10,4 +10,6 @@
    private Long count;

    private String statusName;

    private String currentDate;
}

 src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml

@@ -16,8 +16,8 @@
            <if test="ew.status != null">
                and n.status = #{ew.status}
            </if>
            <if test="ew.expiration_date != null ">
                and n.expiration_date >=  DATE_FORMAT(#{ew.expiration_date},'%Y-%m-%d')
            <if test="ew.currentDate != null">
                and n.expiration_date >= DATE_FORMAT(#{ew.currentDate},'%Y-%m-%d')
            </if>
        </where>
    </select>