Merge remote-tracking branch 'origin/master'

zhongrj

2024-01-31 a5c2a3b99f46866a666618bc461340aa4e679b1c

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


}