Merge remote-tracking branch 'origin/master'

lin

2024-04-10 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af

 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);


}