From beb6e85c9b054e8edced241c3367814a0a19d70c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 11:42:38 +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/dao/ShoppingGoodsAssembleDao.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsAssembleDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsAssembleDao.java
index ac6776e..3abe996 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsAssembleDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsAssembleDao.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.matrix.core.pojo.PaginationVO;
+import com.matrix.system.app.vo.ShoppingGoodsDetailVo;
 import com.matrix.system.hive.bean.ShoppingGoodsAssemble;
 import org.apache.ibatis.annotations.Param;
 
@@ -63,4 +64,6 @@
 	public int deleteByGoodsId(@Param("shoppingGoodsId") Long shoppingGoodsId);
 
 	public void batchInsert(@Param("list") List<ShoppingGoodsAssemble> list);
+
+	List<ShoppingGoodsDetailVo> selectGoodsRelationGoodsList(@Param("goodsId") Long id, @Param("goodsType") String goodsType);
 }
\ No newline at end of file

--
Gitblit v1.9.1