Merge branch 'master' into ty_urgent

Helius

2020-12-11 aaeaded75d418e6582c16ebd983fe6b052b889b8

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