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

maven

3 小时以前 9c508cbb87a6f617ee8423027911b4b1a23d350f

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

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

@@ -16,6 +16,9 @@
            <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>
        </where>
    </select>
</mapper>