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/PlatformInterfaceLog.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
index 0d8df6c..3d14fd1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
@@ -1,8 +1,6 @@
package com.doumee.dao.business.model;
-import com.baomidou.mybatisplus.annotation.TableField;
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;
@@ -15,12 +13,12 @@
/**
* 浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍
* @author 姹熻箘韫�
- * @since 2024/04/28 16:06
+ * @date 2024/06/28 10:03
*/
@Data
@ApiModel("浣滀笟璋冨害骞冲彴鎺ュ彛浜や簰璁板綍")
@TableName("`platform_interface_log`")
-public class PlatformInterfaceLog extends LoginUserModel {
+public class PlatformInterfaceLog {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -33,6 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,6 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -61,7 +61,8 @@
@ApiModelProperty(value = "鍦板潃淇℃伅")
@ExcelColumn(name="鍦板潃淇℃伅")
- private String url;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date url;
@ApiModelProperty(value = "璇锋眰鍙傛暟")
@ExcelColumn(name="璇锋眰鍙傛暟")
@@ -87,11 +88,4 @@
@ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
private String objId;
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
- @TableField(exist = false)
- private Date startDate;
-
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
- @TableField(exist = false)
- private Date endDate;
}
--
Gitblit v1.9.3