From ea7e96af3785241c34f6a6385fb10745328c3e56 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 23 七月 2024 11:31:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/ExcelVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/ExcelVo.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/ExcelVo.java
index 5170626..c0e78cc 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/ExcelVo.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/ExcelVo.java
@@ -36,7 +36,7 @@
 public class ExcelVo implements Converter<byte[]> {
     @ColumnWidth(40)
     @ExcelProperty("璁惧鍙�")
-    public String equipNo ;
+    public String deviceNo ;
 
     @ColumnWidth(40)   //璁剧疆鍒楀(鍙互淇グ绫�,涔熷彲浠ヤ慨楗板叿浣撳睘鎬�)
     @ExcelProperty(value = "璁惧浜岀淮鐮�", converter = ExcelVo.class)

--
Gitblit v1.8.0