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

performance-web/src/main/java/com/clx/performance/controller/thirdparty/NbBankController.java

 package com.clx.performance.controller.thirdparty;
 
-import com.msl.common.result.Result;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,9 +17,15 @@ public class NbBankController {
 
     @ApiOperation(value = "notify", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/notify", method = RequestMethod.POST)
-    public Result bankNotify() {
+    public void bankNotify(@RequestBody JSONObject param) {
+
+        log.info("宁波银行回调, data:{}", param.toJSONString());
+
+//        HashMap hashMap = new HashMap();
+//        hashMap.put("errorCode", "000000");
+//        hashMap.put("errorMsg", "000000");
+
 
-        return Result.ok();
     }
 
 }