From 67b7fca6f21c2088a1887ba2027360efdb089c1c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 16:08:12 +0800
Subject: [PATCH] 代码合并冲突解决
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java
index 2ff01fc..b67b60a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActReserveCommitVO.java
@@ -1,8 +1,11 @@
package com.panzhihua.common.model.vos.community;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
@Data
@ApiModel("提交预约/登记参数")
@@ -19,4 +22,11 @@
private String phone;
@ApiModelProperty("类型 1预约 2登记")
private Integer type;
+ @ApiModelProperty("预约时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reserveTime;
+ @ApiModelProperty("姓名")
+ private String name;
+ @ApiModelProperty("预约内容")
+ private String content;
}
--
Gitblit v1.7.1