Merge remote-tracking branch 'origin/master'

zhongrj

2024-03-11 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116

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


}