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

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java

@@ -258,13 +258,28 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "是否允许用户自定义金额")
     private String isMemberIn;
 
-
     @Column(name = "is_member_return")
     @ApiModelProperty(value = "是否允许用户自定义金额")
     private String isMemberReturn;
 
+    @Column(name = "is_table_fee")
+    @ApiModelProperty(value = "是否免除桌位费 0否1是")
+    private Integer isTableFee;
 
+    @Column(name = "tableFee")
+    @ApiModelProperty(value = "桌位费")
+    private BigDecimal tableFee;
 
+    @Column(name = "eat_model")
+    @ApiModelProperty(value = "就餐模式 堂食 dine-in 外带 take-out")
+    private String eatModel;
+
+    @Column(name = "small_qrcode")
+    @ApiModelProperty(value = "程序码(零点八零首页)")
+    private String smallQrcode;
+    @Column(name = "payment_qrcode")
+    @ApiModelProperty(value = "店铺收款码")
+    private String paymentQrcode;
 
     public void copy(TbShopInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));