Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

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

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

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


}