Merge remote-tracking branch 'origin/master'

tangzy

2021-11-25 a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d

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