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/loadposition/entity/LoadPosition.java | 77 +++++---------------------------------
1 files changed, 11 insertions(+), 66 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java
index 68c7382..99f32ec 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java
@@ -1,8 +1,13 @@
package com.mes.loadposition.entity;
+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;
import java.io.Serializable;
@@ -12,6 +17,9 @@
* @author system
* @since 2024-07-09 14:51:27
*/
+@Data
+@Component
+@EqualsAndHashCode(callSuper = false)
@TableName("load_position")
@ApiModel(value = "LoadPosition", description = " ")
public class LoadPosition implements Serializable{
@@ -21,8 +29,8 @@
/**
*
*/
- @ApiModelProperty(" ")
- private Long id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
* 鏋跺瓙缂栧彿
@@ -52,7 +60,7 @@
* 浠撳偍浠诲姟缂栧彿
*/
@ApiModelProperty("浠撳偍浠诲姟缂栧彿")
- private Long storageTaskId;
+ private Integer storageTaskId;
/**
* 涓婄墖浣嶇被鍨�
@@ -67,68 +75,5 @@
private Integer routeGroup;
- 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 Long getMachineId() {
- return machineId;
- }
-
- public void setMachineId(Long machineId) {
- this.machineId = machineId;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public Long getStorageTaskId() {
- return storageTaskId;
- }
-
- public void setStorageTaskId(Long storageTaskId) {
- this.storageTaskId = storageTaskId;
- }
-
- public Integer getTypeFlag() {
- return typeFlag;
- }
-
- public void setTypeFlag(Integer typeFlag) {
- this.typeFlag = typeFlag;
- }
-
- public Integer getRouteGroup() {
- return routeGroup;
- }
-
- public void setRouteGroup(Integer routeGroup) {
- this.routeGroup = routeGroup;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0