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

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java

@@ -186,4 +186,6 @@ public class TbShopInfoDto implements Serializable {
     private String districts;
 
     private String cities;
+
+    private String isCustom;
 }

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

@@ -244,6 +244,10 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "区")
     private String districts;
 
+    @Column(name = "is_custom")
+    @ApiModelProperty(value = "是否允许用户自定义金额")
+    private String isCustom;
+
     public void copy(TbShopInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));
     }