From 7f6737cea2a64ca4dd852e5f3e13b5dcd6299859 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 09:19:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 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 84c61c2..5179e8a 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
@@ -76,6 +76,7 @@
                     comActReserveDO.setJoinCount(joinCount != null ? joinCount - 1 : 0);
                     comActReserveMapper.updateById(comActReserveDO);
                     ComActReserveOperationRecordDO comActReserveOperationRecordDO=new ComActReserveOperationRecordDO();
+                    comActReserveOperationRecordDO.setRemark(comActReserveRecord.getContent());
                     comActReserveOperationRecordDO.setReserveId(comActReserveRecordDO.getReserveId());
                     comActReserveOperationRecordDO.setReserveRecordId(comActReserveRecordDO.getId());
                     comActReserveOperationRecordDO.setType(ComActReserveOperationRecordDO.type.br);

--
Gitblit v1.7.1