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 01ad320..b1bdf8d 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
@@ -19,58 +19,69 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SOFT_TYPE {
-        IMPP(1, 0, 0, "impp-platform", "IMPP平台"),
-        CORE(2, 8100, 4, "i3core", "i3业务平台"),
-        WMS(3, 8200, 10, "i3wms", "仓库管理软件"),
-        MES(4, 8300, 11, "i3mes", "生产管理软件"),
-        QMS(5, 0, 0, "i3qms", "质量管理软件"),
-        MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"),
-        SWEB(7, 8800, 19, "i3sweb", "供应商服务"),
-
-        PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"),
-        PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
-
-        FORM(20, 8900, 16, "block-form", "智能表单"),
-        REPORT(21, 8910, 17, "block-report", "智能报表"),
-        WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"),
-        JOBFLOW(23, 0, 0, "block-jobflow", "智能作业流"),
-        SOFTSWITCH(24, 8920, 18, "block-softswitch", "软件适配器"),
-        HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
-        LAC(26, 8600, 13, "lac", "连接适配器"),
-        ANDON(27, 8500, 14, "andon", "安灯"),
-        APS(28, 8400, 15, "i3aps", "高级计划与排产"),
-        CENTER(99, 8000, 1, "icloud-server", "注册中心"),
-        SURFACE(98, 0, 0, "i3surface", "对外服务"),
-        CLOUD(97, 0, 0, "i3cloud", "微服务"),
-        GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"),
-        CONSOLE(95, 8010, 2, "impp-console", "服务监控台"),
-        DEV(9999, 0000, 0, "Development", "系统调试");
+        /** WMS 服务 */
+        WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"),
+        SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"),
+        QMS(5, 0, 0, 0, "i3qms", "质量管理软件"),
 
-        /**
-         * 产品ID
-         */
+        /** Mes 服务 */
+        MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"),
+        MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"),
+
+        /** PTL 服务 */
+        PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"),
+        PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
+
+        /** Block 服务 */
+        FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"),
+        REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"),
+        WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"),
+        JOBFLOW(23, 0, 0, 0, "block-jobflow", "智能作业流"),
+        SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"),
+        HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"),
+
+        /** LAC 服务 */
+        LAC(26, 8600, 13, 150000000L, "lac", "连接适配器"),
+
+        /** 安灯服务 */
+        ANDON(27, 8500, 14, 110000000L, "andon", "安灯"),
+
+        /** 计划排产服务 */
+        APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"),
+        SURFACE(98, 0, 0, 0, "i3surface", "对外服务"),
+
+        /** 基础服务 */
+        IMPP(1, 0, 0, 100000000L, "impp-platform", "IMPP平台"),
+        CONSOLE(95, 8010, 0, 0, "impp-console", "服务监控台"),
+        GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"),
+        CLOUD(97, 0, 0, 0, "i3cloud", "微服务"),
+        CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"),
+
+        /** 平台服务 */
+        CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"),
+
+        /** 调试服务 */
+        DEV(9999, 0000, 0, 120000000L, "Development", "系统调试");
+
+
+        /** 产品ID */
         private int value;
-        /**
-         * 应用默认端口
-         */
-        private int prot;
-        /**
-         * 应用默认雪花DataBaseId(0-31)共32 个存储区
-         */
+        /** 应用默认端口 */
+        private int port;
+        /** 应用默认雪花DataBaseId(0-31)共32 个存储区 */
         private int snowflakeId;
-        /**
-         * 产品代码
-         */
+        /** 产品代码 */
         private String code;
-        /**
-         * 产品描述
-         */
+        /** 顶级菜单代码 */
+        private long menuRootId;
+        /** 产品描述 */
         private String description;
 
-        SOFT_TYPE(int value, int prot, int snowflakeId, String code, String description) {
+        SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) {
             this.value = value;
-            this.prot = prot;
+            this.port = port;
             this.snowflakeId = snowflakeId;
+            this.menuRootId = menuRootCode;
             this.code = code;
             this.description = description;
         }
@@ -87,14 +98,18 @@ public class CommonEnumUtil {
             return description;
         }
 
-        public int getProt() {
-            return prot;
+        public int getPort() {
+            return port;
         }
 
         public int getSnowflakeId() {
             return snowflakeId;
         }
 
+        public long getMenuRootId() {
+            return menuRootId;
+        }
+
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -135,7 +150,6 @@ public class CommonEnumUtil {
         }
 
         public static SOFT_TYPE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];
@@ -144,6 +158,15 @@ public class CommonEnumUtil {
             return null;
         }
 
+        public static SOFT_TYPE valueOfMenuRootId(long id) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].menuRootId == id) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
         public static SOFT_TYPE codeOfDescription(String code) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].code.equals(code)) {
@@ -921,7 +944,9 @@ public class CommonEnumUtil {
     public enum LOG_LOGIN_PLATFORM {
         PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"),
         PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"),
-        Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端");
+        Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"),
+        MES_PCN(40, "MES-PCN", "MES-PCN"),
+        PTL_PCN(50, "PTL-PCN", "PTL-PCN");
 
         private int value;
         private String name;
@@ -2176,6 +2201,89 @@ public class CommonEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_SOURCE_STATUS {
+        CONN_SUCCESS(10, "验证成功", "验证成功"),
+        CONN_FAILURE(20, "验证失败", "验证失败");
+//        TIME_OUT(30, "连接超时", "连接超时"),
+//        AUTH_ERROR(40, "账号密码错误", "账号密码错误");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private DATA_SOURCE_STATUS (int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static DATA_SOURCE_STATUS valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
     /**
      * PC自定义搜索-字段类型
      * 10-文本，20-数字，30-下拉框，40，时间，50-开窗
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 0323dbd..86c0877 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -6416,53 +6416,6 @@ public class WmsEnumUtil {
     }
 
     /**
-     * BatchHold 值类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum FG_INSTOCK_SN_TYPE {
-        NORMAL(10, "NORMAL", "实物条码(正常)"),
-        FIRST_PIECE(20, "FIRST_PIECE", "首件"),
-        MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"),
-        TAIL_PIECE(40, "TAIL_PIECE", "末件");
-
-        private int value;
-        private String code;
-        private String description;
-
-        FG_INSTOCK_SN_TYPE(int value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-
-        public static String valueOfDescription(int val) {
-            return valueOf(val);
-        }
-    }
-
-    /**
      * 返修、挑选状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
index 4d2fc73..fc99205 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@@ -130,6 +130,10 @@ public class MesPlc extends BaseBean implements Serializable {
     @ApiParam("密码")
     private String password;
 
+    @Column(name = "DEFAULT_RULE")
+    @ApiParam("默认赋值属性")
+    private String defaultRule;
+
     @Transient
     @ApiParam("设备名称")
     private String equipmentName;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java
index 77c3e53..d1cc3c6 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java
@@ -70,6 +70,28 @@ public class ImppLicense implements Serializable {
     @ApiParam(value ="深思授权信息")
     private ImppLicenseSenseshield senseshield;
 
+    /* 备用预留字段 */
+    @ApiParam(value ="备用字段")
+    private String licenseSpare01;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare02;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare03;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare04;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare05;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare06;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare07;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare08;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare09;
+    @ApiParam(value ="备用字段")
+    private String licenseSpare10;
+
     /* 业务人员信息 */
     @ApiParam(value ="授权创建时间")
     private Date licenseCreateDateTime;         // 授权时间
@@ -92,6 +114,7 @@ public class ImppLicense implements Serializable {
     @ApiParam(value ="锁类型")
     private String lockType;
 
+
     /* 基础业务逻辑 */
     @ApiParam(value ="到期时间")
     private String maturityDateTime;
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java
new file mode 100644
index 0000000..a32264f
--- /dev/null
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDataSource.java
@@ -0,0 +1,87 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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;
+
+/**
+ * @Description : 数据对象
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-02-27 10:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_DATA_SOURCE")
+@Api(value="数据对象")
+public class SysDataSource extends BaseBean {
+
+    @Column(name="SOFT_TYPE")
+    @ApiParam(value ="产品类型")
+    private Integer softType;
+
+    public String getSoftTypeTxt() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
+    }
+
+    @Column(name="SOURCE_NAME")
+    @ApiParam(value ="数据源名称")
+    private String sourceName;
+
+    @Column(name="SOURCE_CODE")
+    @ApiParam(value ="数据源编码")
+    private String sourceCode;
+
+    @Column(name="SOURCE_STATUS")
+    @ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在")
+    private Integer sourceStatus;
+    public String getSourceStatusTxt() {
+        return softType == null ? null : CommonEnumUtil.DATA_SOURCE_STATUS.valueOfDescription(sourceStatus);
+    }
+
+    @Column(name="SOURCE_TYPE")
+    @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE")
+    private Integer sourceType;
+    public String getSourceTypeTxt() {
+        return softType == null ? null : CommonEnumUtil.DATA_SOURCE_TYPE.valueOfDescription(sourceType);
+    }
+
+
+    @Column(name="SOURCE_HOST")
+    @ApiParam(value ="数据源连接地址")
+    private String sourceHost;
+
+    @Column(name="SOURCE_PORT")
+    @ApiParam(value ="数据源端口")
+    private Integer sourcePort;
+
+    @Column(name="SOURCE_DATA_BASE_NAME")
+    @ApiParam(value ="数据库名称")
+    private String sourceDataBaseName;
+
+    @Column(name="SOURCE_USER_NAME")
+    @ApiParam(value ="数据库用户名称")
+    private String sourceUserName;
+
+    @Column(name="SOURCE_PASSWORD")
+    @ApiParam(value ="数据库用户密码")
+    private String sourcePassword;
+
+    @Column(name="SOURCE_DESCRIPTION")
+    @ApiParam(value ="数据源描述")
+    private String sourceDescription;
+
+}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java
index 79daa0f..4121b94 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java
@@ -68,4 +68,12 @@ public class SysDepartment extends BaseBean {
     @ApiParam(value ="子集列表")
     private List<SysDepartment> childList;
 
+    public SysDepartment() {
+    }
+
+    public SysDepartment(String departmentCode, Long parentId, Long organizeId) {
+        this.departmentCode = departmentCode;
+        this.parentId = parentId;
+        this.organizeId = organizeId;
+    }
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
index 8a47f38..59afede 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
@@ -113,4 +113,10 @@ public class SysMenu extends BaseBean {
     @ApiParam(value ="子集列表")
     private List<SysMenu> childList = new ArrayList<>();
 
+    public SysMenu() {
+    }
+
+    public SysMenu(String menuCode) {
+        this.menuCode = menuCode;
+    }
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
index 2bb58d7..e8162c5 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
@@ -80,4 +80,13 @@ public class SysOrganize extends BaseBean {
     @ApiParam(value ="子集ID列表")
     private List<Long> childIdList;
 
+    public SysOrganize() {
+    }
+
+    public SysOrganize(String organizeCode, Integer organizeType, Long parentId, Integer organizeStatus) {
+        this.organizeCode = organizeCode;
+        this.organizeType = organizeType;
+        this.parentId = parentId;
+        this.organizeStatus = organizeStatus;
+    }
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java
index 3fe7559..4348f54 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java
@@ -26,7 +26,10 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_POJO_VERSION")
+@Table(name="SYS_POJO_VERSION",indexes = {
+    @Index(name="index_sys_pojo_version_ref_id",columnList = "REF_ID"),
+    @Index(name="index_sys_pojo_version_ref_class",columnList = "REF_CLASS"),
+})
 @Api(value="对象历史")
 public class SysPojoVersion extends BaseBean {
 
@@ -41,6 +44,11 @@ public class SysPojoVersion extends BaseBean {
         return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
     }
 
+    @Column(name="PLAN_ID")
+    @ApiParam(value ="对象计划id" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long planId;
+
     @Column(name="REF_ID")
     @ApiParam(value ="对象id" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -79,4 +87,7 @@ public class SysPojoVersion extends BaseBean {
     @ApiParam(value ="用户部门信息")
     private SysPojoVersionDetail versionDetail;
 
+    @Transient
+    @ApiParam(value ="操作对象本身")
+    private String bean;
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java
index 1479652..9040b15 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java
@@ -59,4 +59,11 @@ public class SysPosition extends BaseBean {
     @ApiParam(value ="子部门列表")
     private List<SysPosition> childList;
 
+    public SysPosition() {
+    }
+
+    public SysPosition(String positionCode, Long parentId) {
+        this.positionCode = positionCode;
+        this.parentId = parentId;
+    }
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
index 9786250..788a76c 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
@@ -11,10 +11,8 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 用户登陆表
@@ -53,4 +51,15 @@ public class SysRole extends BaseBean {
     @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1")
     private Integer roleStatus;
 
+    @Transient
+    @ApiParam(value ="角色拥有功能权限信息")
+    private transient List<Long> menuIdList;
+
+    public SysRole() {
+    }
+
+    public SysRole(String name, Integer roleStatus) {
+        this.name = name;
+        this.roleStatus = roleStatus;
+    }
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
index 0a3735b..fded310 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
@@ -247,4 +247,9 @@ public class  SysUserInfo extends BaseBean {
     @ApiParam(value = "岗位信息")
     @AnnoOutputColumn(hidden = true)
     private SysPosition position;
+
+    @Transient
+    @ApiParam(value = "图像信息")
+    @AnnoOutputColumn(hidden = true)
+    private String imageFileUrl;
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java
new file mode 100644
index 0000000..15c469b
--- /dev/null
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDataSourceRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysDataSource;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-11 上午11:05
+ * @Modify:
+ **/
+public interface SysDataSourceRepository extends BaseRepository<SysDataSource, Long> {
+}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index 8e68d4d..d71a80e 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -128,7 +128,7 @@ public class CoreHqlPack {
         DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode());
 
         // 查询参数封装
-//        DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
+        DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
         // String Like
         DdlPreparedPack.getStringLikerPack(position.getName(),"name",result);
         DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
@@ -154,6 +154,21 @@ public class CoreHqlPack {
 
 
     /**
+     * 岗位复杂查询
+     * @param bean
+     * @return
+     */
+    public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
+
+        // 查询参数封装
+        DdlPreparedPack.getNumEqualPack(bean.getUserId(),"userId",result);
+
+        return result;
+    }
+
+
+    /**
      * 组织复杂查询
      * @param organize
      * @return
@@ -176,13 +191,22 @@ public class CoreHqlPack {
     }
 
     public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List<Long> idList){
+        HqlPack.getOrderDefault(organize);
+
         DdlPackBean result = DdlPackBean.getDdlPackBean(organize);
 
-        // String Like
         DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
         DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getNumEqualPack(organize.getParentId(),"parentId",result);
+
+        // 查询参数封装
+        if(organize.getChildIdList() != null){
+            DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result);
+        }
+
         // Number In
         DdlPreparedPack.getInPackList(idList,"id",result);
+
         return result;
     }
 
@@ -201,6 +225,7 @@ public class CoreHqlPack {
      * @param department
      * @return
      */
+    @Deprecated
     public static String packHqlSysDepartment(SysDepartment department){
         StringBuffer result = new StringBuffer();
 
@@ -223,34 +248,15 @@ public class CoreHqlPack {
         DdlPackBean result = DdlPackBean.getDdlPackBean(department);
 
         DdlPreparedPack.getStringLikerPack(department.getName(),"name",result);
-        DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result);
+        DdlPreparedPack.getNumEqualPack(department.getParentId(),"parentId",result);
+        DdlPreparedPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
+        DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);
         DdlPreparedPack.getInPackList(idList,"id",result);
 
         result.setOrderByStr(department.orderBy());
         return result;
     }
 
-    /**
-     * 系统权限复杂查询
-     * @param menu
-     * @return
-     */
-    public static String packHqlSysMenu(SysMenu menu){
-        StringBuffer result = new StringBuffer();
-
-        // 查询参数封装
-        HqlPack.getNumEqualPack(menu.getParentId(),"parentId",result);
-        HqlPack.getNumEqualPack(menu.getMenuType(),"menuType",result);
-        HqlPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result);
-        HqlPack.getStringLikerPack(menu.getName(),"name",result);
-        HqlPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result);
-
-        // 添加默认排序
-        HqlPack.getOrderDefault(menu);
-
-        return result.toString();
-    }
-
     public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List<Long> idList){
         DdlPackBean result = DdlPackBean.getDdlPackBean(menu);
 
@@ -1008,7 +1014,7 @@ public class CoreHqlPack {
      * @return
      */
     public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){
-        DdlPackBean packBean = new DdlPackBean();
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysDictionary);
 
         DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean);
         DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean);
@@ -1020,4 +1026,37 @@ public class CoreHqlPack {
 
         return packBean;
     }
+
+    /**
+     * 按条件查询字典
+     * @param bean
+     * @return
+     */
+    public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean){
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getNumEqualPack(bean.getRefId(),"refId",packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getPlanId(),"planId",packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getOperateType(),"operateType",packBean);
+        DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean);
+        DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean);
+
+        return packBean;
+    }
+
+
+    public static DdlPackBean packSysDataSource(SysDataSource bean){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
+
+        DdlPreparedPack.getStringLikerPack(bean.getSourceHost(), "sourceHost", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSourceName(), "sourceName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSourceCode(), "sourceCode", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bean.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSourceType(), "sourceType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSourceStatus(), "sourceStatus", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSoftType(), "softType", ddlPackBean);
+
+        return ddlPackBean;
+    }
 }
\ No newline at end of file