Merge branch 'gpt_upgrade' into pre

netflix-dao/src/main/java/com/cyksj/model/views/UpgradePackageView.java

@@ -42,6 +42,18 @@ public class UpgradePackageView {
     @DbField("up.sku_ids")
     private String skuIds;
 
+    /**
+     * 升级规格
+     */
+    @DbField("up.upgrade_sku_id")
+    private Long upgradeSkuId;
+
+    /**
+     * gpt类型,0.车票套餐
+     */
+    @DbField("up.gpt_type")
+    private Integer gptType;
+
     /**
      * 商品规格名称
      */