From 66f49f3fdc1b51bcc325a3057f4a64df153a8c22 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Mon, 12 Aug 2019 09:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java     | 8 +++++---
 .../cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java  | 5 +++++
 .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java      | 4 ++++
 3 files changed, 14 insertions(+), 3 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 ecab56a..6b64736 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
@@ -831,8 +831,9 @@ public class BlockFormEnumUtil {
         TEXT(200, "TEXT", "文本"),
         NUMBER(210, "NUMBER", "数字"),
         PASSWORD(230, "PASSWORD", "密码"),
-        DATE(300, "DATE", "日期(yyyy-MM-dd)"),
-        DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
+        DATE(300, "DATE", "日期"),
+//        DATE(300, "DATE", "日期(yyyy-MM-dd)"),
+//        DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
         //        ELEMENT(700, "DICT_SELECT", "元素"),
         DICTIONARY(800, "DICT_SELECT", "字典"),
         CASCADE(900, "CASCADE", "级联");
@@ -973,7 +974,8 @@ public class BlockFormEnumUtil {
         NUM_ADD(20, "ADD", "加法计算",Double.class),
         NUM_LESS(30, "MIN", "减法计算",Double.class),
         NUM_MAKE(40, "MUL", "乘法计算",Double.class),
-        NUM_DIVISION(50, "DIVISION", "除法计算",Double.class);
+        NUM_DIVISION(50, "DIVISION", "除法计算",Double.class),
+        JOIN_TABLE(60, "JOIN_TABLE", "连表查询",String.class);
 
         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 01c97de..688db18 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
@@ -70,6 +70,11 @@ public class BfElementPropertyVirtual extends BaseBean {
     @ApiParam(value = "提示信息")
     private String propertyLabelText;
 
+    @Lob
+    @ApiParam(value = "自定义执行SQL")
+    @Column(name = "PROPERTY_EXECUTE_SQL")
+    private String propertyExecuteSql;
+
     @Column(name = "PROPERTY_SORT")
     @ApiParam(value = "显示顺序")
     private Integer propertySort;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
index e1f5a71..115b32d 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
@@ -37,6 +37,10 @@ public class BfMenu extends BaseBean {
     @ApiParam(value ="菜单名称")
     private String menuName;
 
+    @Column(name="MENU_CODE")
+    @ApiParam(value ="功能代码(唯一校验，路径跳转使用)")
+    private String menuCode;
+
     @Column(name="PARENT_ID")
     @ApiParam(value ="父级菜单id")
     @JsonSerialize(using = ToStringSerializer.class)