商家类型修改

src/main/java/com/izouma/dingdong/domain/backstage/MerchantNature.java

@@ -21,7 +21,7 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @Where(clause = "active = 1")
-@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer"})
 @ApiModel(value = "商家性质", description = "商家性质")
 public class MerchantNature extends BaseEntity implements Serializable {
     @Size(max = 30)
@@ -29,6 +29,7 @@ public class MerchantNature extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "名称", name = "name")
     private String name;
 
-    private Boolean active;
+    @Column(nullable = false)
+    private Boolean active = true;
 
 }

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

@@ -111,6 +111,9 @@ public class MerchantSettings extends BaseEntity {
     @ApiModelProperty(value = "起送金额")
     private BigDecimal startingAmount;
 
+    /**
+     * 每餐准备时间
+     */
     @ApiModelProperty(value = "每餐准备时间")
     private Long preparationTime;