Merge remote-tracking branch 'origin/master'

zengh

2022-07-12 63ea601aa950e88237728bf183e30268a3af8616

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

@@ -83,7 +83,7 @@
            shareholder.setShareholdingratio(shareExcel.getShareholdingratio());
         }

         Shareholder shareholder1 = shareholder;
         Shareholder shareholder1 = Objects.requireNonNull(BeanUtil.copy(shareholder, Shareholder.class));
         //脱敏处理
         if (null!=shareholder1.getCardid() && !shareholder1.getCardid().equals("")){
            shareholder1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(shareholder1.getCardid()));