From 0a62550520293dacf31c4cf0dd58735db066e2dd Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 db6113c..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
@@ -4,14 +4,12 @@
import java.io.Serializable;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+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>
@@ -22,17 +20,22 @@
* @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;
@@ -58,5 +61,7 @@
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id(璐熻矗浜篿d)")
private Integer userId;
+ @ApiModelProperty(value = "鍏宠仈 璁惧id")
+ private Integer deviceId;
}
--
Gitblit v1.9.3