From a5e8dc52dbf29b0ea4b39c00bfe8f88efb6aa76c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 28 九月 2021 20:58:41 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java
index f3b1edd..99d0c00 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
@@ -80,6 +81,7 @@
/**
* 预约时间
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date reserveTime;
/**
@@ -90,6 +92,7 @@
/**
* 创建时间
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
/**
@@ -108,14 +111,9 @@
private Long updateBy;
/**
- * 状态（1.待处理 2.预约成功 3.预约失败 4.已取消）
+ * 处理人id
*/
- public interface status{
- int dcl = 1;
- int yycg = 2;
- int yysb = 3;
- int yqx = 4;
- }
+ private Long handleId;
@Override
public String toString() {
@@ -139,4 +137,21 @@
", updateBy=" + updateBy +
"}";
}
+
+ /**
+ * 状态（1.待处理 2.预约成功 3.预约失败 4.已取消）
+ */
+ public interface status{
+ int dcl = 1;
+ int cg = 2;
+ int sb = 3;
+ int yqx = 4;
+ }
+ /**
+ * 类型（1.预约 2.登记）
+ */
+ public interface type{
+ int yy=1;
+ int dj=2;
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1