From 6457cac82808599492b75f11d770bdf4675005f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 4 Sep 2020 10:44:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8E=BB=E9=99=A4=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= 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 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 a517b70..518f691 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 @@ -13,8 +13,6 @@ import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; import java.io.Serializable; -import java.util.LinkedHashMap; -import java.util.Map; /** * @Description : @@ -65,18 +63,18 @@ public abstract class BaseBean implements Serializable { this.id = id; } - @Column(name="ORGANIZE_CODE", nullable = false) + @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") // @AnnoOutputColumn(hidden = true) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) public String organizeCode; - @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) + @Column(name="IS_VALID", columnDefinition = "int default 1") @ApiParam(value = "有效性",example = "1") @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) + @Column(name="IS_DELETED", columnDefinition = "int default 2") @ApiParam(value = "是否已删除",example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除