Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev

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

@@ -112,6 +112,14 @@ public class BfDataObjectProperty extends BaseBean {
     }
 
     @Transient
+    @ApiParam(value ="是否为数据有效字段")
+    private transient Integer isValidProperty;
+
+    @Transient
+    @ApiParam(value ="是否为弱删除字段")
+    private transient Integer isDeleteWeaklyProperty;
+
+    @Transient
     @ApiParam(value ="元素值")
     private transient Object propertyFormValue;
 

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

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -79,6 +78,22 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    @Column(name = "IS_OBJECT_DEL_WEAK")
+    @ApiParam(value = "是否弱删除")
+    private Integer isObjectDelWeak;
+
+    @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
+    @ApiParam(value = "元素弱删除属性id")
+    private Long elementDelWeakAttrId;
+
+    @Column(name = "IS_OBJECT_VALID")
+    @ApiParam(value = "是否有效")
+    private Integer isObjectValid;
+
+    @Column(name = "ELEMENT_VALID_ATTR_ID")
+    @ApiParam(value = "元素有效属性id")
+    private Long elementValidAttrId;
+
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")
     private Integer isObjectExport;