From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 09:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java
index 9a7b228..6fe3f53 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/BookingTime.java
@@ -1,6 +1,8 @@
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;
@@ -18,7 +20,7 @@
@Data
@ApiModel("浼氳瀹ら绾︽椂闂存鍏宠仈琛�")
@TableName("`meeting_book_time`")
-public class BookingTime {
+public class BookingTime extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -31,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,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鏄�")
@@ -59,4 +59,7 @@
@ExcelColumn(name="鏃堕棿娈电紪鐮侊紙鍏宠仈room_time琛級")
private Integer timeId;
+ @ApiModelProperty(value = "缁撴潫鏃堕棿 HH:mm",hidden = true)
+ @TableField(exist = false)
+ private String endTime;
}
--
Gitblit v1.9.3