From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java | 62 ++++++-------------------------
1 files changed, 12 insertions(+), 50 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java
index b93003e..f01efbf 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java
@@ -2,9 +2,15 @@
import java.io.Serializable;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.stereotype.Component;
/**
*
@@ -12,6 +18,9 @@
* @author system
* @since 2024-07-09 14:51:27
*/
+@Data
+@Component
+@EqualsAndHashCode(callSuper = false)
@TableName("shelf_rack")
@ApiModel(value = "ShelfRack", description = " ")
public class ShelfRack implements Serializable{
@@ -21,8 +30,8 @@
/**
*
*/
- @ApiModelProperty(" ")
- private Long id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
* 鏋跺瓙缂栧彿
@@ -40,7 +49,7 @@
* 鍖呭彿缂栧彿
*/
@ApiModelProperty("鍖呭彿缂栧彿")
- private Long rawPackageId;
+ private Integer rawPackageId;
/**
* 淇敼鏃堕棿
@@ -55,52 +64,5 @@
private String enableState;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getNumber() {
- return number;
- }
-
- public void setNumber(String number) {
- this.number = number;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public Long getRawPackageId() {
- return rawPackageId;
- }
-
- public void setRawPackageId(Long rawPackageId) {
- this.rawPackageId = rawPackageId;
- }
-
- public Date getModTime() {
- return modTime;
- }
-
- public void setModTime(Date modTime) {
- this.modTime = modTime;
- }
-
- public String getEnableState() {
- return enableState;
- }
-
- public void setEnableState(String enableState) {
- this.enableState = enableState;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0