From af3434a79c2a096105668273cfa27c09eacf6ff1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 30 九月 2024 09:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java
index 54ab04c..e6ddd64 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.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")
@@ -59,8 +59,8 @@
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
private String objId;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0鏈堝彴浣滀笟", example = "1")
- @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0鏈堝彴浣滀笟")
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0鏈堝彴浣滀笟 1鍏朵粬", example = "1")
+ @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0鏈堝彴浣滀笟 1鍏朵粬")
private Integer objType;
@ApiModelProperty(value = "鎻愰啋娆℃暟", example = "1")
@@ -85,7 +85,7 @@
@ApiModelProperty(value = "鎻愰啋涓嬪彂鏃堕棿")
@ExcelColumn(name="鎻愰啋涓嬪彂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date hkDate;
@ApiModelProperty(value = "鎻愰啋涓嬪彂澶囨敞")
--
Gitblit v1.9.3