From 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 18:05:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro
---
src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
index 2860655..2dab5c9 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
@@ -45,10 +45,8 @@
@Schema(description = "鏄惁宸查��鏂�")
private Boolean returned;
- @Schema(description = "杞﹂棿id")
- private Long workshopId;
-
@Schema(description = "杞﹂棿鍚嶇О")
+ @Excel(name = "杞﹂棿鍚嶇О",sort = 11)
private String workshopName;
--
Gitblit v1.9.3