Merge branch 'ww' into test

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

@@ -112,6 +112,16 @@ public class TbShopInfo implements Serializable {
     private String districts;
 
     private String isCustom;
+    //是否开启桌位费 0否1是
+    private Integer isTableFee;
+    //桌位费
+    private BigDecimal tableFee;
+    //就餐模式  堂食 dine-in  外带 take-out
+    private String eatModel;
+    //程序码(零点八零首页)
+    private String smallQrcode;
+    //店铺收款码
+    private String paymentQrcode;
 
     private static final long serialVersionUID = 1L;