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

houruijun

2020-09-28 e0395c5454534e7cf657b10045d00e4042dc7e71

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java

@@ -72,7 +72,7 @@
                saasClientPay.setPayStatus(2);
                saasClientPay.setPayMethod(1);
                saasClientPay.setTradeNo(requestMap.get("trade_no"));
                boolean b = saasClientPayService.saveOrUpdate(saasClientPay);
                boolean b = saasClientPayService.updateById(saasClientPay);
            }
            return "success";
        }else {