Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java

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