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

luliqiang

2021-02-26 e7c3314727fc06444689c0e6ecab5fea337afeb0

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

@@ -184,9 +184,11 @@
                    }
                    else if(modelDetail==null)
                    {
                        Boolean isResult=payManagerService.saveproductOrder(payManager,sysUser);
                        if (!isResult) {
                            return ResultBody.failed().msg("套餐充入失败,支付开通失败！");
                        if(payManager.getEnabled()){
                            Boolean isResult=payManagerService.saveproductOrder(payManager,sysUser);
                            if (!isResult) {
                                return ResultBody.failed().msg("套餐充入失败,支付开通失败！");
                            }
                        }
                    }
                } else {