From aa506d81ee1022aa4a9ffa89f65edc29e344d337 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 10:45:54 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
index 9ef84fe..fcfdc64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
@@ -95,7 +95,7 @@
     public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
         ComActRaffleRecord comActRaffleRecord1=comActRaffleRecordService.getById(comActRaffleRecordVO.getId());
         if(comActRaffleRecord1.getStatus()!=1){
-            return R.ok("核销失败");
+            return R.fail("核销失败");
         }
         ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
         BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);

--
Gitblit v1.7.1