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

lidongdong

2022-11-28 67c35b1e492c14a08c7e7a6fa8ffb215f220b152

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java

@@ -357,6 +357,7 @@
                        orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
                        orderGoodsVOS.add(orderGoodsVO);
                    });
                    orderVo.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
                }
                orderVo.setOrderGoodsVOList(orderGoodsVOS);