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

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

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+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 : Adair Peng
+ * @CreateDate : 2019-03-21 13:14
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BF_ELEMENT")
+@Api(value = "对象元素基础", description = "元素基础表")
+public class BfElement extends BaseBean {
+
+    //外键关联数据对象主键
+    @Column(name = "ELEMENT_INFO_ID")
+    @ApiParam(value = "对象元素明细ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementInfoId;
+
+    //外键关联数据对象主键
+    @Column(name = "DATA_OBJECT_ID")
+    @ApiParam(value = "数据对象ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dataObjectId;
+
+    @Column(name="ELEMENT_TYPE")
+    @ApiParam(value ="元素类型")
+    private Integer elementType;
+
+    @Column(name="ELEMENT_NAME")
+    @ApiParam(value ="元素名称")
+    private String elementName;
+
+    @Column(name="ELEMENT_CODE")
+    @ApiParam(value ="元素编码")
+    private String elementCode;
+
+    @Column(name="ELEMENT_ATTR_ID")
+    @ApiParam(value ="默认排序属性")
+    private String elementAttrId;
+
+    @Column(name="ELEMENT_SORT_TYPE")
+    @ApiParam(value ="默认排序规则")
+    private String elementSortType;
+
+    @Column(name="ELEMENT_CSS_STYLE")
+    @ApiParam(value ="元素样式")
+    private String elementCssStyle;
+
+    @Column(name="ELEMENT_DESCRIPTION")
+    @ApiParam(value ="元素描述")
+    private String elementDescription;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.BfElement;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2019-03-21 15:24
+ * @Modify:
+ **/
+public interface BfElementRepository extends BaseRepository<BfElement,Long> {
+}