Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java

@@ -176,7 +176,7 @@ public class DynamicEntity extends BaseBean implements Serializable {
 
                 try {
                     setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{f.getType()});
-                    System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal);
+//                    System.out.println("Method Name:" + setMethod.getName() + "\t\t Value : " + fieldVal);
                     setMethod.invoke(this, fieldVal);
                 } catch (ClassCastException e) {
                     e.printStackTrace();

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

@@ -52,6 +52,20 @@ public class BfDataObjectProperty extends BaseBean {
     @ApiParam(value ="数据对象类型")
     private Integer objectColumnType;
 
+    // 字段长度
+    @ApiParam(value = "字段长度")
+    @Column(name="OBJECT_COLUMN_PRECISION")
+    private Integer objectColumnPrecision;
+
+    // 字段精确长度
+    @ApiParam(value = "字段精确长度")
+    @Column(name="OBJECT_COLUMN_SCALE")
+    private Integer objectColumnScale;
+
+    @Column(name="OBJECT_COLUMN_TYPE_NAME")
+    @ApiParam(value ="数据对象类型名称")
+    private String objectColumnTypeName;
+
     @Column(name="PROPERTY_NAME")
     @ApiParam(value ="类属性名称")
     private String propertyName;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.model.form;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :   数据操作Model
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2019-04-02 13:34
+ * @Modify:
+ **/
+@Data
+public class ElementFormModel {
+
+    //外键关联数据对象主键
+    @ApiParam(value = "元素ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementId;
+
+    @ApiParam(value = "操作参数")
+    private String entity;
+
+}