From 182c04e399f5db26406234767f7ef34b5adc0015 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 20 八月 2025 18:19:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
index d281e7e..60d4545 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
@@ -114,5 +114,11 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "浠撳簱鍚嶇О")
     private String warehouseName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "浠撳簱缂栫爜")
+    private String warehouseCode;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鎶ュ伐绫诲瀷(鎴愬搧FINISHED銆佸崐鎴愬搧HALF)")
+    private String reportType;
 
 }

--
Gitblit v1.9.3