Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -137,6 +137,17 @@ public class BfElement extends BaseBean {
     public boolean isOrganizeIsolation(){
         return isOrganizeIsolation != null && isOrganizeIsolation == BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.ON.getValue();
     }
+    @Column(name = "ELEMENT_ORGANIZE_ISOLATION_ATTR_ID")
+    @ApiParam(value = "组织隔离属性id")
+    private Long elementOrganizeIsolationAttrId;
+
+    public Long getElementOrganizeIsolationAttrId() {
+        return elementOrganizeIsolationAttrId;
+    }
+
+    public void setElementOrganizeIsolationAttrId(Long elementOrganizeIsolationAttrId) {
+        this.elementOrganizeIsolationAttrId = elementOrganizeIsolationAttrId;
+    }
 
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")