From f58561357b9d7a47cf32e1aa368498677b043f30 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 26 八月 2021 09:44:00 +0800
Subject: [PATCH] 预约登记代码合并冲突解决
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActReserveRecordDO.java | 10 ----------
1 files changed, 0 insertions(+), 10 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 dc6fded..13780a4 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
@@ -107,16 +107,6 @@
*/
private Long updateBy;
- /**
- * 状态（1.待处理 2.预约成功 3.预约失败 4.已取消）
- */
- public interface status{
- int dcl = 1;
- int yycg = 2;
- int yysb = 3;
- int yqx = 4;
- }
-
@Override
public String toString() {
return "ComActReserveRecordDO{" +
--
Gitblit v1.7.1