From 74a7354764449e8bb602e137a172c5c1593a261e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Jun 2021 18:14:26 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
index 1942e9b..688d254 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -282,6 +282,8 @@
         }else{
             ScoreGoods scoreGoods = new ScoreGoods();
             scoreGoods.setIsQg(ScoreGoods.ISQG_NO);
+            scoreGoods.setQgEndTime(null);
+            scoreGoods.setQgStartTime(null);
             Example exampleGoods = new Example(ScoreGoods.class);
             Example.Criteria criteriaGoods = exampleGoods.createCriteria();
             criteriaGoods.andEqualTo("id",id);

--
Gitblit v1.9.1