From 8584946ce5bb67150ed64ddd088f46c74cfb2a4a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 6 Jan 2020 21:51:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=20=20=E6=9D=A1=E7=A0=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E4=B8=8B=E5=88=97=E4=B8=89=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=B8=BA?= =?UTF-8?q?=E4=B8=AD=E6=96=87=20=E3=80=91bug7196?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index f2ef95b..a05fe1b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -66,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)