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

101captain

2022-03-07 da8cca4d320908b672f439369e65e9e6a95374e3

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

@@ -24,12 +24,15 @@
            <if test="photoClassifyDTO.name != null and photoClassifyDTO.name != &quot;&quot;">
                and `name` like concat (#{photoClassifyDTO.name},'%')
            </if>
            <if test="photoClassifyDTO.areaCode != null and photoClassifyDTO.areaCode != &quot;&quot;">
                and area_code = #{photoClassifyDTO.areaCode}
            </if>
        </where>
        order by create_at desc
    </select>

    <select id="getPhotoClassifyList" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO">
        select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify
        select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify where area_code = #{areaCode}
        order by create_at desc
    </select>