From d7076a0a4ace159bb5d163e7d46bb93d87a5d8b2 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 14:01:12 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.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/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index e82f808..e10b5f0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -936,7 +936,7 @@
if(comActActActRegistDO.getEndTime()!=null){
return R.fail("无法重复签退");
}
- comActActRegistDO.setId(comActActRegistVO.getId());
+ comActActRegistDO.setId(comActActActRegistDO.getId());
comActActRegistDO.setEndTime(new Date());
int result=comActActRegistDAO.updateById(comActActRegistDO);
if (result > 0) {
--
Gitblit v1.7.1