Merge branch 'dev' into test

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

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.List;
@@ -159,10 +160,16 @@ public class BfElement extends BaseBean {
     @ApiParam(value ="默认排序规则")
     private Integer elementSortAttrType;
 
+    @Lob
     @Column(name="ELEMENT_CSS_STYLE")
     @ApiParam(value ="元素样式")
     private String elementCssStyle;
 
+    @Lob
+    @Column(name="ELEMENT_FORMATTER")
+    @ApiParam(value ="元素样式")
+    private String elementFormatter;
+
     @Column(name="ELEMENT_DESCRIPTION")
     @ApiParam(value ="元素描述")
     private String elementDescription;