Merge branch 'ext-dev' of http://git.estsh.com/andly.pan/i3plus-pojo into pext-dev

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmField.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import io.swagger.annotations.ApiModel;
+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 : pantianhu
+ * @CreateDate : 2021-05-26 17:04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MDM_FIELD")
+@ApiModel("表字段")
+public class MdmField extends BaseMdmBean {
+
+    @Column(name="TABLE_NAME")
+    @ApiParam(value ="表名")
+    private String tableName;
+
+    @Column(name="FIELD_NAME")
+    @ApiParam(value ="字段名称")
+    private String fieldName;
+
+    @Column(name="FIELD_DESCRIPTION")
+    @ApiParam(value ="字段描述")
+    private String fieldDescription;
+
+    @Column(name="IS_SELECT")
+    @ApiParam(value ="是否选中")
+    private Integer isSelect;
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java

@@ -3,10 +3,17 @@ package cn.estsh.i3plus.pojo.mdm.bean.base;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 import java.io.Serializable;
 import java.util.List;
 

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java

@@ -46,4 +46,8 @@ public class MdmExternalApp extends BaseBean {
     @ApiParam("回调地址")
     private String callbackUrl;
 
+    @Column(name = "OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private String operateType;
+
 }