From 4b5d1e73dc796054194691580c86733a2664508c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:08:17 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java
index dc78784..5bb5b9a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Container.java
@@ -2,17 +2,16 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -39,6 +38,7 @@
/**
* 缂栫爜
*/
+ @TableField(exist = false)
@ApiModelProperty(value= "缂栫爜")
private String code;
@@ -64,7 +64,7 @@
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- private Double lenght;
+ private Double length;
/**
* 瀹藉害
@@ -185,7 +185,7 @@
this.name = name;
this.type = typeId;
this.used = used;
- this.lenght = lenght;
+ this.length = lenght;
this.width = width;
this.height = height;
this.rstLen = rstLen;
--
Gitblit v1.9.1