From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
index c1054d7..75657bb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
@@ -1,7 +1,6 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -14,12 +13,12 @@
/**
* 鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�
* @author 姹熻箘韫�
- * @since 2024/04/28 16:06
+ * @date 2024/06/28 10:03
*/
@Data
@ApiModel("鏈堝彴_浣滀笟鎿嶄綔鍘嗗彶琛�")
@TableName("`platform_log`")
-public class PlatformLog extends LoginUserModel {
+public class PlatformLog {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,6 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,6 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -62,8 +63,8 @@
@ExcelColumn(name="绠�浠�")
private String content;
- @ApiModelProperty(value = "鎿嶄綔绫诲瀷 0涓嬪彂浠诲姟 1鍙告満绛惧埌 2瀹℃牳閫氳繃 3瀹℃壒涓嶉�氳繃 4鍙彿 5杞氦鏈堝彴 6鎸傝捣 7鍙告満杩涘巶 8鍙告満绂诲巶 9浣滀笟浣滃簾鍙栨秷 10浣滀笟瀹屾垚", example = "1")
- @ExcelColumn(name="鎿嶄綔绫诲瀷 0涓嬪彂浠诲姟 1鍙告満绛惧埌 2瀹℃牳閫氳繃 3瀹℃壒涓嶉�氳繃 4鍙彿 5杞氦鏈堝彴 6鎸傝捣 7鍙告満杩涘巶 8鍙告満绂诲巶 9浣滀笟浣滃簾鍙栨秷 10浣滀笟瀹屾垚")
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷 0浠诲姟鍒涘缓 1鍙告満纭浠诲姟 2鍙告満绛惧埌 3鍏ュ洯绛夊緟 4鏈堝彴鍙彿 5寮�濮嬩綔涓� 6浣滀笟瀹屾垚 7鏈堝彴杞Щ 8浠诲姟鎸傝捣 9涓嬪彂鎺堟潈绂诲洯 10绂诲洯", example = "1")
+ @ExcelColumn(name="鎿嶄綔绫诲瀷 0浠诲姟鍒涘缓 1鍙告満纭浠诲姟 2鍙告満绛惧埌 3鍏ュ洯绛夊緟 4鏈堝彴鍙彿 5寮�濮嬩綔涓� 6浣滀笟瀹屾垚 7鏈堝彴杞Щ 8浠诲姟鎸傝捣 9涓嬪彂鎺堟潈绂诲洯 10绂诲洯")
private Integer objType;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
@@ -78,4 +79,20 @@
@ExcelColumn(name="鎿嶄綔鍚庡唴瀹�")
private String afterContent;
+ @ApiModelProperty(value = "鍙傛暟1")
+ @ExcelColumn(name="鍙傛暟1")
+ private String param1;
+
+ @ApiModelProperty(value = "鍙傛暟2")
+ @ExcelColumn(name="鍙傛暟2")
+ private String param2;
+
+ @ApiModelProperty(value = "鍙傛暟3")
+ @ExcelColumn(name="鍙傛暟3")
+ private String param3;
+
+ @ApiModelProperty(value = "鍙傛暟4")
+ @ExcelColumn(name="鍙傛暟4")
+ private String param4;
+
}
--
Gitblit v1.9.3