From 76a7156b6908bf4b0a3d0b2ee18ceefacb510383 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 29 五月 2024 12:08:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
index 748f04f..7c50037 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
@@ -2,6 +2,7 @@
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;
@@ -19,7 +20,7 @@
@Data
@ApiModel("浜哄憳鍩硅鏈夋晥鏈熻褰�")
@TableName("`train_time`")
-public class TrainTime {
+public class TrainTime extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -34,7 +35,6 @@
private Integer edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
--
Gitblit v1.9.3