Merge branch 'test_bak' into 'test'

罗元桥

2021-09-26 68deda36440e82e2d67257768166c0324ffc9077

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

@@ -81,6 +81,7 @@
      <if test="gridMemberWainDTO.keyWord!=null and gridMemberWainDTO.keyWord!= &quot;&quot;">
         AND (content like concat(#{gridMemberWainDTO.keyWord},'%') or position_address like concat(#{gridMemberWainDTO.keyWord},'%'))
      </if>
      order by create_at desc
   </select>

   <update id="setUserWorkStatus">