Merge branch 'ty_urgent' into test

Helius

2020-12-27 862f4f0942da8033bf49af89eca0055ad8cb4730

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