Merge remote-tracking branch 'origin/test' into test

src/main/java/com/chaozhanggui/system/cashierservice/entity/OrderVo.java

@@ -2,6 +2,7 @@ package com.chaozhanggui.system.cashierservice.entity;
 
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 
@@ -19,6 +20,7 @@ public class OrderVo {
 
     private String sendType;
 
-    @NotBlank
     private String eatModel;
+    @Min(1)
+    private Integer seatNum;
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopTable.java

@@ -1,8 +1,11 @@
 package com.chaozhanggui.system.cashierservice.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+@Data
 public class TbShopTable implements Serializable {
     private Integer id;
 
@@ -36,133 +39,7 @@ public class TbShopTable implements Serializable {
 
     private String qrcode;
 
-    public String getQrcode() {
-        return qrcode;
-    }
+    private Integer autoClear;
 
-    public void setQrcode(String qrcode) {
-        this.qrcode = qrcode;
-    }
 
-    private static final long serialVersionUID = 1L;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    public Integer getShopId() {
-        return shopId;
-    }
-
-    public void setShopId(Integer shopId) {
-        this.shopId = shopId;
-    }
-
-    public Integer getMaxCapacity() {
-        return maxCapacity;
-    }
-
-    public void setMaxCapacity(Integer maxCapacity) {
-        this.maxCapacity = maxCapacity;
-    }
-
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public Integer getAreaId() {
-        return areaId;
-    }
-
-    public void setAreaId(Integer areaId) {
-        this.areaId = areaId;
-    }
-
-    public Byte getIsPredate() {
-        return isPredate;
-    }
-
-    public void setIsPredate(Byte isPredate) {
-        this.isPredate = isPredate;
-    }
-
-    public BigDecimal getPredateAmount() {
-        return predateAmount;
-    }
-
-    public void setPredateAmount(BigDecimal predateAmount) {
-        this.predateAmount = predateAmount;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status == null ? null : status.trim();
-    }
-
-    public Byte getType() {
-        return type;
-    }
-
-    public void setType(Byte type) {
-        this.type = type;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public BigDecimal getPerhour() {
-        return perhour;
-    }
-
-    public void setPerhour(BigDecimal perhour) {
-        this.perhour = perhour;
-    }
-
-    public String getView() {
-        return view;
-    }
-
-    public void setView(String view) {
-        this.view = view == null ? null : view.trim();
-    }
-
-    public Long getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Long createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Long getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Long updatedAt) {
-        this.updatedAt = updatedAt;
-    }
 }