Merge branch 'test' of https://gitee.com/jyyforjava/zq-erp into test

Helius

2020-12-27 3eb52981c3e97af186174d7eacbcb7ec0c5f8739

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