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/rawusage/entity/RawUsage.java | 116 +++++----------------------------------------------------
1 files changed, 11 insertions(+), 105 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
index 56e7dac..de0b617 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.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("raw_usage")
@ApiModel(value = "RawUsage", description = " ")
public class RawUsage implements Serializable{
@@ -21,8 +30,8 @@
/**
*
*/
- @ApiModelProperty(" ")
- private Long id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
* 鐜荤拑绫诲瀷
@@ -97,108 +106,5 @@
private String batchId;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getRawType() {
- return rawType;
- }
-
- public void setRawType(String rawType) {
- this.rawType = rawType;
- }
-
- public Float getRawWidth() {
- return rawWidth;
- }
-
- public void setRawWidth(Float rawWidth) {
- this.rawWidth = rawWidth;
- }
-
- public Float getRawHeight() {
- return rawHeight;
- }
-
- public void setRawHeight(Float rawHeight) {
- this.rawHeight = rawHeight;
- }
-
- public Float getRawThickness() {
- return rawThickness;
- }
-
- public void setRawThickness(Float rawThickness) {
- this.rawThickness = rawThickness;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getColor() {
- return color;
- }
-
- public void setColor(String color) {
- this.color = color;
- }
-
- public Integer getPieces() {
- return pieces;
- }
-
- public void setPieces(Integer pieces) {
- this.pieces = pieces;
- }
-
- public Integer getLeftPieces() {
- return leftPieces;
- }
-
- public void setLeftPieces(Integer leftPieces) {
- this.leftPieces = leftPieces;
- }
-
- public String getQrcode() {
- return qrcode;
- }
-
- public void setQrcode(String qrcode) {
- this.qrcode = qrcode;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getProductionTime() {
- return productionTime;
- }
-
- public void setProductionTime(Date productionTime) {
- this.productionTime = productionTime;
- }
-
- public String getBatchId() {
- return batchId;
- }
-
- public void setBatchId(String batchId) {
- this.batchId = batchId;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0