licailing 5 роки тому
батько
коміт
1ecad5ede7

+ 2 - 1
src/main/java/com/izouma/dingdong/domain/merchant/MerchantSettings.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalTime;
 import java.util.Set;
@@ -25,7 +26,7 @@ import java.util.Set;
 @Builder
 @Where(clause = "enabled = true")
 @ApiModel(value = "商户设置", description = "商户设置")
-public class MerchantSettings extends BaseEntity {
+public class MerchantSettings extends BaseEntity implements Serializable {
 /*    @ApiModelProperty(value = "用户ID")
     private Long userId;*/
 

+ 2 - 1
src/main/java/com/izouma/dingdong/dto/MerchantDTO.java

@@ -15,6 +15,7 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.BatchSize;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -24,7 +25,7 @@ import java.util.Set;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class MerchantDTO {
+public class MerchantDTO implements Serializable {
     public MerchantDTO(Merchant merchant, MerchantSettings merchantSettings) {
         address = merchant.getAddress();
         aliAccount = merchant.getAliAccount();