Jenkins自动合并

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", "颜色"),

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;