From 2cffa027595247c136a8ee95f5f745c58cb0cce5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 13:08:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 1bb26a4..01ef33a 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.bean.vo;
import com.ruoyi.basic.dto.StorageBlobVO;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductionOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -20,12 +21,15 @@
private String customerName;
@Schema(description = "浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О",sort = 2)
private String productName;
@Schema(description = "瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸",sort = 3)
private String model;
@Schema(description = "宸ヨ壓璺嚎缂栫爜")
+ @Excel(name = "宸ヨ壓璺嚎缂栧彿",sort = 4)
private String processRouteCode;
@Schema(description = "浜у搧鍥剧墖")
@@ -35,6 +39,7 @@
private String bomNo;
@Schema(description = "瀹屾垚杩涘害")
+ @Excel(name = "瀹屾垚杩涘害",sort = 7)
private BigDecimal completionStatus;
@Schema(description = "鏄惁宸查��鏂�")
--
Gitblit v1.9.3