From e80adff2cfff2fa9d29aff9e5a7f2feb52681ef8 Mon Sep 17 00:00:00 2001
From: liuke <123456>
Date: Fri, 11 Dec 2020 18:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
index ba6faad..b1996c0 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
@@ -103,7 +103,7 @@
                 productOrder.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
             }
             //默认添加的合同视为无效合同,在充值完成后,会将对应合同启用
-            productOrder.setIsDel(true);
+//            productOrder.setIsDel(true);
             boolean v = productOrderService.saveOrUpdate(productOrder);
             if (v) {
                 return ResultBody.ok().data(productOrder).msg("保存成功");

--
Gitblit v1.8.0