From 1afdf3622484b9a54c4cc4642e38bbf5c815884f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 04 二月 2021 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/entity/DangerousEncode.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/DangerousEncode.java b/src/main/java/com/nanometer/smartlab/entity/DangerousEncode.java
index 3fcceb2..a763b38 100644
--- a/src/main/java/com/nanometer/smartlab/entity/DangerousEncode.java
+++ b/src/main/java/com/nanometer/smartlab/entity/DangerousEncode.java
@@ -1,10 +1,11 @@
package com.nanometer.smartlab.entity;
+import java.io.Serializable;
import java.util.Date;
-public class DangerousEncode {
+public class DangerousEncode implements Serializable {
/** id id **/
- private String id;
+ private Long id;
/** 柜码 container_number **/
private String containerNumber;
@@ -51,14 +52,12 @@
/** 使用次数 count **/
private Integer count;
- /** id id **/
- public String getId() {
+ public Long getId() {
return id;
}
- /** id id **/
- public void setId(String id) {
- this.id = id == null ? null : id.trim();
+ public void setId(Long id) {
+ this.id = id;
}
/** 柜码 container_number **/
@@ -211,4 +210,4 @@
this.count = count;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2