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

performance-web/src/main/java/com/clx/performance/controller/temp/TempBankController.java

@@ -45,16 +45,9 @@ public class TempBankController {
     @ApiOperation(value = "订单支付1", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/orderDirectPay1", method = RequestMethod.POST)
     public Result<NbBankOrderPayResultVO> orderDirectPay1(String payAcctNo, String payAcctNm) {
-
 //        return Result.ok(bankService.orderDirectPay(null,2,"313332082914","86041110000076809", "黑玫瑰"));
 //        return Result.ok(bankService.orderDirectPay(null,2,"313332082914","86041110000075926", "客户客户"));
-        return Result.ok(bankService.orderDirectPay(null,1,"313332082914",payAcctNo, payAcctNm));
-    }
-    @ApiOperation(value = "订单支付2", notes = "<br>By:艾庆国")
-    @RequestMapping(value = "/orderDirectPay2", method = RequestMethod.POST)
-    public Result<NbBankOrderPayResultVO> orderDirectPay2(String payAcctOpenBankId, String payAcctNo, String payAcctNm) {
-
-        return Result.ok(bankService.orderDirectPay(null,1,payAcctOpenBankId,payAcctNo, payAcctNm));
+        return Result.ok(bankService.orderDirectPay(null,"",1,"313332082914",payAcctNo, payAcctNm));
     }
 
     @ApiOperation(value = "查询", notes = "<br>By:艾庆国")