Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/java/com/ydtech/modules/admin/service/impl/SysUserBankCardServiceImpl.java

src/main/java/com/ydtech/modules/admin/service/impl/SysUserBankCardServiceImpl.java

@@ -93,6 +93,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         } else {
             SysUserBankCard sysUserBankCard = new SysUserBankCard();
             BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
+            sysUserBankCard.setBankNumber(sysUserBankCardVO.getBankNumber().replaceAll("\\s+", ""));
             sysUserBankCard.setDelFlag("0");
             sysUserBankCard.setCreateTime(new Date());
             sysUserBankCard.setAuditStatus("0");
@@ -168,7 +169,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
 
     @Override
     public SysUserBankCard getByBankNumber(String bankNumber, String userId) {
-        return baseMapper.getByBankNumber(bankNumber, userId);
+        return baseMapper.getByBankNumber(bankNumber);
     }
 
     @Override
@@ -201,6 +202,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
             BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
             sysUserBankCard.setCreateTime(new Date());
             sysUserBankCard.setAuditStatus("0"); //待审核
+            sysUserBankCard.setBankNumber(sysUserBankCardVO.getBankNumber().replaceAll("\\s+", ""));
             sysUserBankCard.setUserName(BaseController.getUser().getName());
             baseMapper.insert(sysUserBankCard);
             SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();