Merge branch 'ty_urgent' into test

wzy

2020-12-20 53c616910a3fd6f2f9669242690c1c85f2ba0a68

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

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

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

    /**