From 05d6f132cec26a4b6a5deb59dc676962c1ae1dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 15 Feb 2020 13:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8B=BE=E5=8F=96=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A3=80=E6=9F=A5=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9f3237c..fff23d9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1298,7 +1298,8 @@ public class CommonEnumUtil { // DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), // ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), - CASCADE(900, "CASCADE", "级联"); + CASCADE(900, "CASCADE", "级联"), + PICK_UP(1000, "PICK_UP", "拾取"); //FILE(400, "file", "文件"), //IMAGE(410, "image", "image"), //OFF(500, "color", "颜色"), diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index a102246..0ca9d53 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -119,6 +119,14 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "控件引用RefKey") private String propertyControlRefKey; + @Column(name = "PROPERTY_CONTROL_TEXT_KEY") + @ApiParam(value = "控件显示文本Key") + private String propertyControlTextKey; + + @Column(name = "PROPERTY_CONTROL_VALUE_KEY") + @ApiParam(value = "控件引用值Key") + private String propertyControlValueKey; + @Column(name = "PROPERTY_DESCRIPTION") @ApiParam(value = "属性描述") private String propertyDescription;