Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -26,6 +26,7 @@
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="article_id" property="articleId"/>
    </resultMap>

    <!--自定义分页查询-->