Merge remote-tracking branch 'origin/master'

Administrator

2022-05-18 644ed3e30bbee9a417dfbe649f2a72df25a7efb1

 src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java

@@ -42,8 +42,8 @@
   }

   @Override
   public IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String creditcode) {
      return page.setRecords(baseMapper.selectShareholderInfo(page,creditcode));
   public IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String deptId) {
      return page.setRecords(baseMapper.selectShareholderInfo(page,deptId));
   }