From c18037dc5de7f67175c2cf80cd04761d198739b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 19:48:50 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
index d8acf42..299361c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
@@ -522,7 +522,7 @@
         ShoppingGoodsDetailVo goodsDetailVo = new ShoppingGoodsDetailVo();
         goodsDetailVo.setImg(shoppingGoods.getImg());
         goodsDetailVo.setGoodsName(shoppingGoods.getName());
-        goodsDetailVo.setGoodsNo(shoppingGoods.getGoodsNo());
+        goodsDetailVo.setGoodsNo(shoppingGoods.getCode());
         goodsDetailVo.setGoodsType(shoppingGoods.getGoodType());
         goodsDetailVo.setDesc(shoppingGoods.getDescription());
         goodsDetailVo.setMaxSaleCnt(shoppingGoods.getCarMaxSaleCount());

--
Gitblit v1.9.1