From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index e609fb0..7a1a108 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -24,14 +24,15 @@
/**
* 鍥芥爣鐮�
*/
- @Excel(name = "璁惧缂栫爜",sort = 1)
+ @Excel(name = "璁惧缂栫爜",sort = 1,width = 20)
private String deviceNo;
/**
* 鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
*/
private Integer deviceBrand;
-
+ @Excel(name = "鏍囩",sort = 4)
+ private String tagStr;
/**
* 鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
*/
@@ -52,50 +53,50 @@
* 妫�娴嬫椂闂�
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "妫�娴嬫椂闂�",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 10)
+ @Excel(name = "妫�娴嬫椂闂�",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 11)
private Date checkTime;
/**
* 鏍囨敞鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "OSD鏍囨敞鏃堕棿",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 9)
+ @Excel(name = "OSD鏍囨敞鏃堕棿",dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 10)
private Date setTime;
/**
* osd閫氶亾鍚�
*/
- @Excel(name = "閫氶亾鍚嶇О",sort = 4)
+ @Excel(name = "閫氶亾鍚嶇О",sort = 5,width = 32)
private String osdName;
/**
* osd鐪�
*/
- @Excel(name = "OSD鐪�",sort = 5)
+ @Excel(name = "OSD鐪�",sort = 6)
private String osdProvince;
/**
* osd甯�
*/
- @Excel(name = "OSD甯�",sort = 6)
+ @Excel(name = "OSD甯�",sort = 7)
private String osdCity;
/**
* osd鍖�
*/
- @Excel(name = "OSD鍖�",sort = 7)
+ @Excel(name = "OSD鍖�",sort = 8)
private String osdPart;
/**
* osd宸︿笅瑙�
*/
- @Excel(name = "OSD宸︿笅瑙�",sort = 8)
+ @Excel(name = "OSD宸︿笅瑙�",sort = 9)
private String osdLB;
/**
* osdTimeCorrect鏃堕棿鏄惁姝ｇ‘
*/
- @Excel(name = "鏃堕棿鏄惁姝ｇ‘",sort = 16, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "鏃堕棿鏄惁姝ｇ‘",sort = 17, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdTimeCorrect;
/**
@@ -106,7 +107,7 @@
/**
* osd閫氶亾鍚嶆槸鍚︽纭� 1姝ｇ‘ 0鏈煡 -1閿�
*/
- @Excel(name = "閫氶亾鍚嶆槸鍚︽纭�",sort = 11, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "閫氶亾鍚嶆槸鍚︽纭�",sort = 12, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdNameCorrect;
/**
@@ -117,7 +118,7 @@
/**
* osd鐪佹槸鍚︽纭�
*/
- @Excel(name = "OSD鐪佹槸鍚︽纭�",sort = 12, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "OSD鐪佹槸鍚︽纭�",sort = 13, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdProvinceCorrect;
/**
@@ -128,7 +129,7 @@
/**
* osd甯傛槸鍚︽纭�
*/
- @Excel(name = "OSD甯傛槸鍚︽纭�",sort = 13, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "OSD甯傛槸鍚︽纭�",sort = 14, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdCityCorrect;
/**
@@ -139,7 +140,7 @@
/**
* osd鍖烘槸鍚︽纭�
*/
- @Excel(name = "OSD鍖烘槸鍚︽纭�",sort = 14, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "OSD鍖烘槸鍚︽纭�",sort = 15, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdPartCorrect;
/**
@@ -149,7 +150,7 @@
/**
* osd宸︿笅瑙掓槸鍚︽纭�
*/
- @Excel(name = "OSD宸︿笅鏄惁姝ｇ‘",sort = 15, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
+ @Excel(name = "OSD宸︿笅鏄惁姝ｇ‘",sort = 16, readConverterExp = "0=鏈煡,1=姝ｇ‘,-1=閿欒")
private Integer osdLbCorrect;
--
Gitblit v1.8.0