From 6c7a7ce93ce6a0978cd5ffd909e6e1780d19b0d7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 19:10:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
index 0f5927c..80aca22 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -78,5 +78,8 @@
@ApiModelProperty(value = "璁惧鐘舵�� 0鍦ㄧ嚎 1绂荤嚎", example = "1")
@ExcelColumn(name="璁惧鐘舵�� 0鍦ㄧ嚎 1绂荤嚎")
private Integer status;
+ @ApiModelProperty(value = "璁惧绶ㄧ⒓")
+ @ExcelColumn(name="璁惧绶ㄧ⒓")
+ private String hkNo;
}
--
Gitblit v1.9.3