Merge remote-tracking branch 'origin/master'

tangzy

2021-11-05 98f8d438a976d73e7c4f6434efc8867ebe2a07a5

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

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