Merge branch 'ty_urgent' into test

wzy

2020-12-20 53c616910a3fd6f2f9669242690c1c85f2ba0a68

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