Merge branch 'refs/heads/dev' into test

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

@@ -14,7 +14,6 @@ public class ChoseCountDTO {
     private Integer shopId;
     @NotEmpty
     private String tableId;
-    @NotNull
     @Min(1)
     private Integer num;
 }

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

@@ -11,6 +11,7 @@ public class ShopEatTypeInfoDTO {
     private boolean isMunchies;
     private boolean isDineInAfter;
     private boolean isDineInBefore;
+    private boolean needSeatFee;
     private TbShopInfo shopInfo;
     private String useType;
     private String sendType;