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

# Conflicts:
#	src/main/java/com/ydtech/modules/admin/dao/SysUserBankCardMapper.java
#	src/main/resources/mapper/modules/admin/SysUserBankCardMapper.xml

src/main/java/com/ydtech/modules/admin/dao/SysUserBankCardMapper.java

@@ -20,7 +20,7 @@ public interface SysUserBankCardMapper extends BaseMapper<SysUserBankCard> {
 
     HttpResult<SysUserBankCardVO> getByUserId(String userId);
 
-    SysUserBankCard getByBankNumber(@Param("fromBankCardId") String bankNumber,@Param("userId") String userId);
+    SysUserBankCard getByBankNumber(@Param("fromBankCardId") String bankNumber, @Param("userId") String userId);
 
     List<SysUserBankCard> getUserBankList(@Param("sysUserBankCard") SysUserBankCard sysUserBankCard);