Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java

@@ -40,5 +40,5 @@
    * @return
    */
   IPage<ShareholderVO> selectShareholderPage(IPage<ShareholderVO> page, ShareholderVO shareholder);
   List<Map<Object,String>> selectShareholderInfo(String creditcode);
   IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String creditcode);
}