From be4bfd2dac75cf4249ef30f85c4fbb07d0dcc67f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 24 十月 2023 18:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 2ed0440..7d70fe3 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -299,7 +299,7 @@
         log.setActInfo(memberRides.getBackInfo());
         log.setActReason(memberRides.getBackReason());
         log.setIsdeleted(Constants.ZERO);
-        log.setCreateDate(update.getBackDate());
+        log.setCreateDate(new Date());
         log.setCreator(user.getId());
         log.setBeforeContent(beforeContent);
         log.setAfterContent(after);
@@ -383,7 +383,7 @@
         ActionLog log = new ActionLog();
         log.setId(Constants.getUUID());
         log.setIsdeleted(Constants.ZERO);
-        log.setCreateDate(update.getBackDate());
+        log.setCreateDate(new Date());
         log.setCreator(user.getId());
         log.setBeforeContent(beforeContent);
         log.setAfterContent(after);

--
Gitblit v1.9.3