From 4c11a8061041c7e0a64ef95ea67ca6df50b0e3e9 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 18 十一月 2022 10:31:36 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
index 56e4650..16fb8c3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
@@ -264,7 +264,7 @@
                     shopFlowerGoodsAttrDAO.updateById(comShopGoodsAttrDO);
                 } else {
                     comShopGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
-                    comShopGoodsAttrDO.setGoodsId(shopGoodsDO.getId());
+                    comShopGoodsAttrDO.setGoodsId(id);
                     comShopGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
                     comShopGoodsAttrDO.setGoodsName(shopGoodsDO.getName());
                     comShopGoodsAttrDO.setGoodsAttrName(goodsAttr.getGoodsAttrName());

--
Gitblit v1.7.1