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

tangxiaobao

2021-08-26 6bc4e0aa18aa1286b9d3e2c24e9c83a634d044de

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

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -89,6 +89,9 @@
        <if test='comActEasyPhotoVO.isReportUrban != null' >
            AND p.`is_report_urban` = #{comActEasyPhotoVO.isReportUrban}
        </if>
        <if test='comActEasyPhotoVO.classifyId != null' >
            AND p.`classify_id` = #{comActEasyPhotoVO.classifyId}
        </if>
        <if test='comActEasyPhotoVO.urbanStatus != null' >
            AND p.`urban_status` = #{comActEasyPhotoVO.urbanStatus}
        </if>