商户类

src/main/java/com/izouma/dingdong/domain/merchant/MerchantSettings.java

@@ -17,6 +17,7 @@ import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalTime;
+import java.util.HashSet;
 import java.util.Set;
 
 @Data
@@ -68,7 +69,7 @@ public class MerchantSettings extends BaseEntity implements Serializable {
             inverseJoinColumns = {@JoinColumn(name = "cate_id", referencedColumnName = "id", foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))})
     @BatchSize(size = 20)
     @ApiModelProperty(value = "经营品类", name = "category")
-    private Set<Category> category;
+    private Set<Category> category = new HashSet<>();
 
 /*    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.DETACH})
     @JoinTable(
@@ -109,18 +110,17 @@ public class MerchantSettings extends BaseEntity implements Serializable {
     private MerchantNature merchantNature;
 
     @Column(precision = 10, scale = 2)
-    @ApiModelProperty(value = "起送金额",name = "startingAmount")
+    @ApiModelProperty(value = "起送金额", name = "startingAmount")
     private BigDecimal startingAmount;
 
     /**
      * 每餐准备时间
      */
-    @ApiModelProperty(value = "每餐准备时间",name = "preparationTime")
+    @ApiModelProperty(value = "每餐准备时间", name = "preparationTime")
     private Long preparationTime;
 
-    @ApiModelProperty(value = "门头图片",name = "doorHeadImg")
+    @ApiModelProperty(value = "门头图片", name = "doorHeadImg")
     private String doorHeadImg;
 
 
-
 }