From e514479f0062b6fb942190d38f07ef59659189f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 4 Jun 2019 11:26:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 4 ++-- .../i3plus/pojo/form/bean/BfElementPropertyVirtual.java | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index f68a09e..1f1a66f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -16,8 +16,8 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FORM_TABLE_TYPE { - TABLE(1, "table", "表"), - VIEW(2, "view", "视图"); + TABLE(1, "TABLE", "表"), + VIEW(2, "*", "视图"); private int value; private String code; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 4e27e99..01c97de 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -11,10 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -49,9 +46,14 @@ public class BfElementPropertyVirtual extends BaseBean { private String propertyCode; @Column(name="PROPERTY_NAME") - @ApiParam(value ="虚拟属性名称") + @ApiParam(value ="显示名称") private String propertyName; + @Lob + @Column(name="PROPERTY_CODES") + @ApiParam(value ="属性代码") + private String propertyCodes; + @Column(name="PROPERTY_TYPE") @ApiParam(value ="属性类型") private Integer propertyType;