diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904181710__UPDATE_MERCHANT.sql b/mallinkAdmin/src/main/resources/db/migration/V201904181710__UPDATE_MERCHANT.sql
new file mode 100644
index 000000000..15885cbc5
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201904181710__UPDATE_MERCHANT.sql
@@ -0,0 +1,2 @@
+alter table wx_merchant
+add column `bill_setting` int(10) default 3 COMMENT '待缴提醒';
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
index bf4c8287b..c7d1f0a95 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
@@ -162,6 +162,17 @@ public class WxMerchant implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="是否为商管商户 1是 0否",name="status")
private Integer isAdmin;
+ @io.swagger.annotations.ApiModelProperty(value = "待缴提醒", name = "billSetting")
+ private Integer billSetting;
+
+ public Integer getBillSetting() {
+ return billSetting;
+ }
+
+ public void setBillSetting(Integer billSetting) {
+ this.billSetting = billSetting;
+ }
+
public Integer getIsAdmin() {
return isAdmin;
}
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
index 9b03df279..ac4b7093c 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
@@ -23,12 +23,13 @@
+
`id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`,
- `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`
+ `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`