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

Helius

2021-01-25 0eb83b49a381c31a51b8c8cec9e4d9d88fd5d16f

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java

@@ -438,6 +438,10 @@
            return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
        }

        if (type == 2 && shoppingGoods.getUseDateNum() == null && StringUtils.isNotBlank(shoppingGoods.getBuyDateUnit())) {
            return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
        }

        if (type == 2 && buyDate == null) {
            throw new GlobleException("购买日期不能为空");
        }