From aaeaded75d418e6582c16ebd983fe6b052b889b8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Dec 2020 14:27:59 +0800
Subject: [PATCH] Merge branch 'master' into ty_urgent

---
 zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 61e0ace..116c7e7 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
@@ -4,6 +4,7 @@
 import com.matrix.system.hive.bean.ShoppingGoods;
 import com.matrix.system.hive.plugin.util.BaseServices;
 
+import java.util.Date;
 import java.util.List;
 /**
  *
@@ -98,4 +99,6 @@
 	public List<ShoppingGoods> findAll(ShoppingGoods shoppingGoods);
 
 	public  ShoppingGoods findByCode(String goodsCode);
+
+	Date calInvalidTime(ShoppingGoods shoppingGoods, Integer type);
 }
\ No newline at end of file

--
Gitblit v1.9.1