Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-16 503135f1f8a7cfed29cac1786a6a7c8758eed8d3

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

@@ -105,6 +105,7 @@
      <if test = "query.status == 0">
            and (vt.event_status = 1 or vt.event_status = 3 or vt.event_status = 6 or vt.event_status = 6)
      </if>
      group by cardNoStr
      order by vt.id desc
   </select>