Merge remote-tracking branch 'origin/master'

alien-entity/src/main/java/shop/alien/entity/store/LifeGroupBuyMain.java

@@ -185,7 +185,7 @@ public class LifeGroupBuyMain {
      */
     @ApiModelProperty(value = "发票类型(0电子发票/1纸质发票)")
     @TableField("invoice_type")
-    private Integer invoiceType;
+    private String invoiceType;
 
     /**
      * 发票说明

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeGroupBuyThaliVo.java

@@ -123,7 +123,7 @@ public class LifeGroupBuyThaliVo {
      */
     @ApiModelProperty(value = "有效期类型(0指定天数/1指定时间段)")
     @TableField("effective_date_type")
-    private Integer effectiveDateType;
+    private String effectiveDateType;
 
     /**
      * 有效期值