Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-28 e04735fb7d9cf321f262a1d5338adc92d4856bc0

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