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

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -174,6 +174,7 @@ import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 
 import cn.yixblog.platform.http.HttpRequestGenerator;
 import cn.yixblog.platform.http.HttpRequestResult;
@@ -3548,6 +3549,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         checkOrgPermission(manager, client);
 
         SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(client, SubRpayMerchantInfo.class);
+        subRpayMerchantInfo.CheckEmpty();
         rpayApi.registerMerchant(client.getIntValue("client_id"), subRpayMerchantInfo);
 
         logger.debug("访问成功，返回的信息是：   "  );