From 68ee8235c8cd659fba5e59e3d924d5ea093504ab Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 七月 2024 08:39:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
index 7afc44a..896ac12 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
@@ -1,7 +1,6 @@
 package com.mes.downworkstation.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -62,14 +61,16 @@
     /**
      * 鎬绘暟閲�
      */
-    @TableField("total_quantity")
-    private Integer totalquantity;
+    private Integer totalQuantity;
 
     /**
      * 钀芥灦鏁伴噺
      */
-    @TableField("racks_number")
-    private Integer Racksnumber;
+    private Integer racksNumber;
+    /**
+     * 浜哄伐涓嬬墖鏁伴噺
+     */
+    private Integer otherNumber;
 
 
 }

--
Gitblit v1.8.0