Merge branch 'api' into hive2.0

Helius

2021-01-28 f935e297274e5e75b5c16be62d14b000007ef832

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

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

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

    /**