Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-08-07 b536b4e005a3aee7908a60c31eddff90bf4b98dc

 java110-db/src/main/resources/mapper/user/OwnerCarServiceDaoImplMapper.xml

@@ -136,9 +136,9 @@
        from owner_car t
        left join t_dict t1 on t.car_type=t1.status_cd and t1.table_name='owner_car' and t1.table_columns = 'car_type'
        left join t_dict t2 on t.state=t2.status_cd and t2.table_name='owner_car' and t2.table_columns = 'state'
        left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id =
        t.community_id
        left join building_owner bow on t.owner_id = bow.member_id and bow.status_cd = '0' and bow.community_id = t.community_id
        where 1=1

        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd = #{statusCd}
        </if>
@@ -223,7 +223,6 @@
        <if test="valid == 2">
            and t.ps_id= '-1'
        </if>

        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}