Merge remote-tracking branch 'origin/test' into test

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

@@ -58,6 +58,18 @@ public class MesTooling extends BaseBean implements Serializable {
     @ApiParam("提醒次数")
     private Integer remindCount;
 
+    @Column(name = "WARNING_TIME")
+    @ApiParam("预警次数")
+    private Integer warningTime;
+
+    @Column(name = "NOTIFY_USER_EMP_NO")
+    @ApiParam("通知员工号")
+    private String notifyUserEmpNo;
+
+    @Column(name = "NOTIFY_USER_NAME")
+    @ApiParam("通知员工名称")
+    private String notifyUserName;
+
     @Transient
     @ApiParam("使用次数")
     private Integer useCount;

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesToolingDetail;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/6/26 5:57 PM
+ * @Modify:
+ */
+public interface MesToolingDetailRepository extends BaseRepository<MesToolingDetail, Long> {
+}