Merge remote-tracking branch 'origin/master'

zhongrj

2024-02-03 b0f0ed0a1cb771c4d1a17e3c8ce90e0cf68cb641

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


}