Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 4c11a8061041c7e0a64ef95ea67ca6df50b0e3e9

 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());