From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java b/src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java
index 89be920..a00040c 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java
@@ -24,7 +24,19 @@
      * 鍛樺伐ID
      */
     @TableField(value = "staff_id")
-    private Integer staffId;
+    private String staffId;
+
+    /**
+     * 鎺掔彮浜哄憳
+     */
+    @TableField(value = "staff_name")
+    private String staffName;
+
+    /**
+     * 鍗堜紤鏃堕棿
+     */
+    @TableField(value = "lunch_time")
+    private String lunchTime;
 
     /**
      * 閮ㄩ棬
@@ -44,6 +56,7 @@
     @TableField(value = "work_date")
     private Date workDate;
 
+
     /**
      * 寮�濮嬪伐浣滄椂闂�
      */

--
Gitblit v1.9.3