合并master 少合并了。 补上

修改bug

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/GoblinMixAppDetailsVo.java

@@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.List;
 
 @Data
 @EqualsAndHashCode
@@ -37,8 +36,8 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
     private Integer limit;
     @ApiModelProperty(position = 18, value = "白名单类型[0-会员|1-指定用户|2-全部用户]")
     private Integer whiteType;
-    @ApiModelProperty(position = 20, value = "配置详情")
-    private List<GoblinMixDetailsItemVo> item;
+/*    @ApiModelProperty(position = 20, value = "配置详情")
+    private List<GoblinMixDetailsItemVo> item;*/
     @ApiModelProperty(position = 22, value = "状态[6-活动中|7-停用|8-售罄|9-等待开始|10-活动结束]")
     private Integer status;
     @ApiModelProperty(position = 24, value = "IOS支付方式[0-第三方支付|1-苹果支付]")
@@ -60,7 +59,7 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
         }
     }
 
-    public GoblinMixAppDetailsVo copy(GoblinMixDetailsVo source,String storeName) {
+  /*  public GoblinMixAppDetailsVo copy(GoblinMixDetailsVo source,String storeName) {
         if (null == source) return this;
         this.setMixId(source.getMixId());
         this.setName(source.getName());
@@ -81,5 +80,5 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
         this.setPrice(source.getPrice());
         this.setSellPrice(source.getSellPrice());
         return this;
-    }
+    }*/
 }