Merge remote-tracking branch 'origin/master'

tangzy

2021-09-15 6a5040680d4fb921b433b9bf7baf59af09baa750

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