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

101captain

2022-03-07 da8cca4d320908b672f439369e65e9e6a95374e3

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

@@ -57,7 +57,7 @@
      <where>
         AND caep.del_tag = 0
         <if test="easyAppDTO.communityId!=null">
            AND caep.community_id = #{easyAppDTO.communityId}
            AND caep.community_id = ${easyAppDTO.communityId}
         </if>
          <if test="easyAppDTO.isReport!=null">
            AND caep.is_report = #{easyAppDTO.isReport}
@@ -125,7 +125,7 @@
      <where>
         AND caep.del_tag = 0
         <if test="easyAppDTO.communityId!=null">
            AND caep.community_id = #{easyAppDTO.communityId}
            AND caep.community_id = ${easyAppDTO.communityId}
         </if>
         <if test="easyAppDTO.streetId!=null">
            and ca.street_id = #{easyAppDTO.streetId}