From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
index 52e57f1..f7cc10f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
@@ -2,31 +2,40 @@
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+import lombok.experimental.Accessors;
/**
* <p>
- *
+ *
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="Plan瀵硅薄", description="")
public class Plan implements Serializable {
private static final long serialVersionUID = 1L;
+ @TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "璁″垝缂栧彿")
private Integer id;
- @ApiModelProperty(value = "妫�楠岀粨鏋�")
- private String results;
+ @ApiModelProperty(value = "妫�楠岀粨鏋� 0锛氭湭瀹屾垚锛�1锛氬凡瀹屾垚锛�")
+ private int results;
@ApiModelProperty(value = "璇曢獙璇存槑")
private String thing;
@@ -34,10 +43,15 @@
@ApiModelProperty(value = "1锛氬緟璁ら锛�2锛氬緟鍒嗛厤锛�3锛氬凡鍒嗛厤锛�4锛氳秴鏈熷緟鍒嗛厤锛�5锛氬凡瀹屾垚锛�0锛氬凡浣滃簾")
private Integer state;
- @ApiModelProperty(value = "浠诲姟鐧昏鏃堕棿")
- private LocalDateTime createTime;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
- private LocalDateTime updateTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
private Integer version;
@@ -47,5 +61,7 @@
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id(璐熻矗浜篿d)")
private Integer userId;
+ @ApiModelProperty(value = "鍏宠仈 璁惧id")
+ private Integer deviceId;
}
--
Gitblit v1.9.3