Merge branch 'gpt_upgrade' into pre

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

@@ -97,7 +97,6 @@ public class RenewalView {
     private Long userId;
 
     @DbField("gr.expiry_time")
-    @JsonIgnore
     private Date expiryTime;
 
     @DbIgnore
@@ -251,4 +250,5 @@ public class RenewalView {
      * 目前已升级套餐价格
      */
     @DbIgnore
-    private BigDecimal packagePrice;}
+    private BigDecimal packagePrice;
+}