Merge branch 'dev' into test

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TIME")
+@Api("工步参数")
+public class MesTime extends BaseBean {
+
+    @Column(name = "MODULE")
+    @ApiParam("组件")
+    private String module;
+
+    @Column(name = "ELAPSE")
+    @ApiParam("耗时")
+    private Long elapse;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+
+}

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

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTime;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MesTimeRepository extends BaseRepository<MesTime, Long> {
+}