Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -75,6 +75,7 @@
      <if test="query.keyWord != null and query.keyWord != ''">
         and(
         p.card_no_str like concat('%',#{query.keyWord},'%') or
         p.`name` like concat('%',#{query.keyWord},'%') or
         vt.visiter_address like concat('%',#{query.keyWord},'%')
         )
      </if>