增加商户省市区

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

@@ -16,8 +16,10 @@
 package cn.ysk.cashier.dto.shop;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.io.Serializable;
@@ -171,4 +173,14 @@ public class TbShopInfoDto implements Serializable {
     private String profiles;
 
     private String isOpenYhq;
+    /**
+     * 商家二维码
+     */
+    private String shopQrcode;
+
+    private String provinces;
+
+    private String districts;
+
+    private String cities;
 }

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

@@ -222,6 +222,19 @@ public class TbShopInfo implements Serializable {
     @Transient
     private String isOpenYhq;
 
+    @Column(name = "shop_qrcode")
+    @ApiModelProperty(value = "商家二维码")
+    private String shopQrcode;
+    @Column(name = "provinces")
+    @ApiModelProperty(value = "省")
+    private String provinces;
+    @Column(name = "districts")
+    @ApiModelProperty(value = "市")
+    private String districts;
+    @Column(name = "cities")
+    @ApiModelProperty(value = "区")
+    private String cities;
+
     public void copy(TbShopInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));
     }