From 364d3221b9a8e6dd3a19701d30c4dc4239ef8abf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 07 二月 2025 11:48:49 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java
index 1ab32e6..7438d92 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java
@@ -32,7 +32,7 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",index = 5, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 5, dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@@ -50,7 +50,7 @@
private String remark;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1鎹熷潖 2鎶ュ簾", example = "1")
- @ExcelColumn(name="璁惧鐘舵��",index = 3, valueMapping = "0=姝ｅ父;1=鎹熷潖;2=鎶ュ簾;")
+ @ExcelColumn(name="璁惧鐘舵��",index = 3, valueMapping = "0=姝ｅ父;1=鎹熷潖;2=鎶ュ簾;",width = 10)
private Integer status;
@ApiModelProperty(value = "璁惧鍨嬪彿", example = "1")
@@ -67,7 +67,7 @@
private Date company;
@ApiModelProperty(value = "鎯呭喌璇存槑")
- @ExcelColumn(name="杩愮淮澶囨敞",index = 4)
+ @ExcelColumn(name="杩愮淮澶囨敞",index = 4,width = 30)
private String content;
@ApiModelProperty(value = "杩愮淮鏃堕棿")
@@ -75,17 +75,17 @@
private Date dealDate;
@ApiModelProperty(value = "璁惧鍚嶇О")
- @ExcelColumn(name="璁惧鍚嶇О",index = 2)
+ @ExcelColumn(name="璁惧鍚嶇О",index = 2,width = 20)
@TableField(exist = false)
private String deviceName;
@ApiModelProperty(value = "璁惧缂栧彿")
- @ExcelColumn(name="璁惧缂栧彿",index = 1)
+ @ExcelColumn(name="璁惧缂栧彿",index = 1,width = 10)
@TableField(exist = false)
private String deviceCode;
@ApiModelProperty(value = "杩愮淮浜哄悕绉�")
- @ExcelColumn(name="杩愮淮浜�",index = 0)
+ @ExcelColumn(name="杩愮淮浜�",index = 0,width = 10)
@TableField(exist = false)
private String realName;
--
Gitblit v1.9.3