From 69c182c463cc640187a809bf6134d171a982cacc Mon Sep 17 00:00:00 2001 From: litao Date: Tue, 20 Dec 2022 14:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=B9=E8=AE=AD=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/springblade/lims/entry/Instrument.java | 6 ++++++ .../java/org/springblade/lims/entry/RepairApplication.java | 3 +-- .../java/org/springblade/lims/entry/ScrapApplication.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java index 4c32cfc..b378816 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Instrument.java @@ -62,4 +62,10 @@ public class Instrument extends BaseEntity implements Serializable { private String instrumentStatus; + // 是否需要检定 + private String isVerification; + + // 报废年限 + private Integer scrapYears; + } \ No newline at end of file diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java index e55eba9..c7a94d2 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/RepairApplication.java @@ -33,8 +33,7 @@ public class RepairApplication extends BaseEntity implements Serializable { // 制造商 private String manufacturer; // 型号 - @TableField("model") - private String version; + private String model; // 出厂日期 private Date productionDate; // 启用日期 diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ScrapApplication.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ScrapApplication.java index 9610cea..2ea956c 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ScrapApplication.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ScrapApplication.java @@ -35,7 +35,7 @@ public class ScrapApplication extends BaseEntity implements Serializable { // 处理情况 private String handling; // 金额 - private Double money; + private String money; // 报废原因及技术状况 private String reasonAndState; // 设备员id