Merge branch 'master' into dev

cweb/src/main/java/com/cweb/controller/BsTradeOrderController.java

@@ -446,11 +446,12 @@ public class BsTradeOrderController {
     @ApiOperation(value = "获取拉卡拉银联用户id")
     public ResponseData getLkLUnionUserId(@RequestBody JSONObject body) {
         try {
+            System.out.println(body);
             if (body == null
                     || StringUtils.isBlank(body.getString("serialNumber"))
                     || StringUtils.isBlank(body.getString("userAuthCode"))
                     || StringUtils.isBlank(body.getString("appUpIdentifier"))) {
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.PASSWORD_ERROR, "");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
             }
             // 查询二维码
             BsPayQrCode qrCode = payQrCodeService.getDetailBySN(body.getString("serialNumber"));