Merge branch 'mj_upgrade' into pre

netflix-dao/src/main/java/com/cyksj/model/entity/UpgradePackage.java

@@ -24,7 +24,7 @@ public class UpgradePackage extends BaseEntity{
     /**
      * 商品规格id
      */
-    private String skuId;
+    private String skuIds;
 
     /**
      * 套餐价格