Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-28 e04735fb7d9cf321f262a1d5338adc92d4856bc0

 zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java

@@ -429,6 +429,9 @@
     */
    private Date invalidTime;

    /**
     * 任选套餐是否无限次 N-否 Y-是
     */
    private String isInfinite;

    /**