From 752476b3dfb5188a262c1ec717bd7eab9e6844ab Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Oct 2019 20:11:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=821086=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E7=AC=AC2=E6=AC=A1=E6=8F=90=E4=BA=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 6 ++++++ .../java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index f25404e..5a14ad7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :设备作业任务明细 @@ -57,5 +59,9 @@ public class MesEquTaskDetail extends BaseBean { @ApiParam("维修标识") private Integer repairFlag; + @Transient + @ApiParam(value ="点检保养记录") + private List equTaskStandardRecordList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java index d93bbd5..e26b0c3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java @@ -31,7 +31,7 @@ import java.util.List; @Api("用户信息model") public class EquTaskNotifyUserModel extends BaseBean { - @ApiParam(value ="人员ID") + @ApiParam(value ="账户ID") private Long userId; @Column(name="USER_NAME_RDD")