Merge remote-tracking branch 'origin/master'

lin

2024-03-16 6195b0dadf2a2d9d433d9059a20a53b702297bee

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

@@ -39,7 +39,9 @@
    * @return
    */
   List<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage page,
                                                @Param("propertyCapitalApply") PropertyCapitalApplyVO propertyCapitalApply);
                                                @Param("propertyCapitalApply") PropertyCapitalApplyVO propertyCapitalApply,
                                                @Param("regionChildCodesList") List<String> regionChildCodesList,
                                                @Param("isAdministrator") Integer isAdministrator);


}