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

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

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

@@ -45,5 +45,7 @@ public class TbOrderDetail implements Serializable {
     private Integer placeNum;
     private String useType;
 
+    private String note;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -111,6 +111,8 @@ public class TbOrderInfo implements Serializable {
 
     private String useType;
     private Integer placeNum;
+    private Integer seatCount;
+    private BigDecimal seatAmount;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ClearTableDTO.java

@@ -0,0 +1,14 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ClearTableDTO {
+    @NotNull
+    private Integer shopId;
+    @NotBlank
+    private String tableId;
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/PrintDTO.java

@@ -0,0 +1,7 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class PrintDTO {
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ReturnCartDTO.java

@@ -0,0 +1,15 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ReturnCartDTO {
+    @NotNull
+    private Integer cartId;
+    @NotNull
+    private Integer shopId;
+    @NotNull
+    private Long tableId;
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ShopEatTypeInfoDTO.java

@@ -13,4 +13,5 @@ public class ShopEatTypeInfoDTO {
     private boolean isDineInBefore;
     private TbShopInfo shopInfo;
     private String useType;
+    private String sendType;
 }