From be98bd60f3332f4960d8a5a27778e2d6c2cdcb7f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 15:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into hive2.0

---
 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