Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev

101captain

2022-03-07 da8cca4d320908b672f439369e65e9e6a95374e3

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

@@ -36,7 +36,7 @@
            AND grid_street_id = #{pageEventGridMemberWarnLogDTO.gridStreetId}
         </if>
          <if test="pageEventGridMemberWarnLogDTO.gridCommunityId!=null">
            AND grid_community_id = #{pageEventGridMemberWarnLogDTO.gridCommunityId}
            AND grid_community_id = ${pageEventGridMemberWarnLogDTO.gridCommunityId}
         </if>
          <if test="pageEventGridMemberWarnLogDTO.gridId!=null">
            AND grid_id = #{pageEventGridMemberWarnLogDTO.gridId}