diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051308__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051308__L_ALTER_RENT.sql
new file mode 100644
index 000000000..bdbcf050a
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201906051308__L_ALTER_RENT.sql
@@ -0,0 +1,2 @@
+alter table wx_brand
+add column `is_del` SMALLINT(1) DEFAULT 0 COMMENT '是否删除1是0否';
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java
index 840b92f74..bc8f5a6ea 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java
@@ -3,7 +3,6 @@ package com.iformall.domain.po;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
-
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -53,6 +52,9 @@ public class WxBrand extends BaseEntity{
@io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "createdate")
private Date createdate;
+ @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel")
+ private Integer isDel;
+
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
diff --git a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml
index 82a6971d9..f4cba5536 100644
--- a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml
@@ -10,15 +10,15 @@
-
+
- `id`,`name`,`createtime`,`updatetime`,`tenant_id`,`logo`,`summary`,`createdate`
+ `id`,`name`,`createtime`,`updatetime`,`tenant_id`,`logo`,`summary`,`createdate`,is_del
- where 1 = 1
+ where is_del = 0
and `id` = #{id}
and `name` like concat('%',#{name},'%')
and `createtime` = #{createtime}