Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-28 83571cf68bc955b8b804d3402331d1ba7f2f4e6c

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

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

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

    /**