Merge remote-tracking branch 'origin/master'

lin

2024-04-12 b9f32ef5413a1b267f86f79db169386aff61c9e7

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

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

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