Merge branch 'test' into 'test_bak'

罗元桥

2021-10-12 3f86488acad10cb3000137a751de611a6a2ba1d3

Merge branch 'test' into 'test_bak'

bug修复

See merge request root/zhihuishequ!231

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml

@@ -69,9 +69,6 @@
        <if test = "query.status != null and query.status != 0">
            and vt.event_status = #{query.status}
        </if>
        <if test="query.tag != null and query.tag != ''">
            and cmpct.label like concat(#{query.tag},'%')
        </if>
        <if test="query.isExp != null and query.isExp != ''">
            and vt.event_status = 7
        </if>