From 22498e4ff995e9069ad0ed72b2a249172375a714 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 30 八月 2021 10:50:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
index 29c07e9..a128e4c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
@@ -66,7 +66,7 @@
                     comActReserveOperationRecordDO.setReserveId(comActReserveRecordDO.getReserveId());
                     comActReserveOperationRecordDO.setReserveRecordId(comActReserveRecordDO.getId());
                     comActReserveOperationRecordDO.setType(ComActReserveOperationRecordDO.type.br);
-                    comActReserveOperationRecordDO.setReserveTime(DateUtil.date());
+                    comActReserveOperationRecordDO.setCreateAt(DateUtil.date());
                     comActReserveOperationRecordDO.setReserveContent(CANCEL);
                     comActReserveOperationRecordDO.setPhone(comActReserveRecordDO.getPhone());
                     comActReserveOperationRecordDO.setStatus(ComActReserveOperationRecordDO.status.qx);

--
Gitblit v1.7.1