Merge branch 'ty_urgent' into test

wzy

2020-12-20 53c616910a3fd6f2f9669242690c1c85f2ba0a68

 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, Date buyDate);
}