Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

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