Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableAddDTO.java

@@ -39,7 +39,7 @@ public class ShopTableAddDTO {
      */
     @NotNull
     @Min(message = "客位数最小为1", value = 1)
-    private Integer capacity;
+    private Integer maxCapacity;
     /**
      * 是否自动清台
      */

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java

@@ -54,6 +54,11 @@ public class ShopUserFlow implements Serializable {
 
     private String remark;
 
+    /**
+     * 是否可退款
+     */
+    private Integer isCanRefund;
+
     /**
      * 关联id，
      * 订单支付/订单退款/霸王餐时 订单id