From a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 19 Dec 2020 15:53:24 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test

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

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java
index 116c7e7..16c6ad5 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java
@@ -100,5 +100,5 @@
 
 	public  ShoppingGoods findByCode(String goodsCode);
 
-	Date calInvalidTime(ShoppingGoods shoppingGoods, Integer type);
+	Date calInvalidTime(ShoppingGoods shoppingGoods, Integer type, Date buyDate);
 }
\ No newline at end of file

--
Gitblit v1.9.1