Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservice...

zhaoxiaohao

2020-09-24 6fd4bdff55620c562e0a22eee3c95924951b04a4

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java

@@ -87,7 +87,7 @@
        saasClientPay.setPayMethod(0);
        saasClientPay.setDiaId("1");
        boolean save = iSaasClientPayService.saveOrUpdate(saasClientPay);
        String s = QRCodeUtil.creatRrCode(resultStr, 200, 200, 0);
        String s = QRCodeUtil.creatRrCode(resultStr, 200, 200, 0).replaceAll("\n","").replaceAll("\r","");
        return ResultBody.ok().data(s);
    }
    @RequestMapping("/callback")