Merge remote-tracking branch 'origin/master'

linwe

2023-12-06 1a47d5fe54230e312aa8486aad7fb30ada1f7b2b

 src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml

@@ -28,7 +28,7 @@
    </resultMap>

    <!--自定义分页查询-->
    <select id="selectPropertyCapitalApplyPage" resultMap="propertyCapitalApplyResultMap">
    <select id="selectPropertyCapitalApplyPage" resultType="org.springblade.modules.property.vo.PropertyCapitalApplyVO">
        select * from jczz_property_capital_apply where is_deleted = 0
        <if test="propertyCapitalApply.districtId!=null">
            and district_id = #{propertyCapitalApply.districtId}