From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
index a2af730..eb6c94e 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/RoomTime.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("`meeting_room_time`")
-public class RoomTime {
+public class RoomTime extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,8 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
@@ -60,8 +59,8 @@
@ExcelColumn(name="寮�鏀惧紑濮嬫椂闂�")
private String startTime;
- @ApiModelProperty(value = "寮�鍙戠粨鏉熸椂闂�")
- @ExcelColumn(name="寮�鍙戠粨鏉熸椂闂�")
+ @ApiModelProperty(value = "寮�鏀剧粨鏉熸椂闂�")
+ @ExcelColumn(name="寮�鏀剧粨鏉熸椂闂�")
private String endTime;
@ApiModelProperty(value = "鐘舵�� 0鍙�� 1涓嶅彲閫� ", example = "1")
--
Gitblit v1.9.3