From 2d0487d82ff61219c71155699b52d8d339a2443a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 23 三月 2022 14:35:27 +0800
Subject: [PATCH] Merge branch 'dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.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/ComActIntegralUserTradeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
index 9cc05c7..637e82b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
@@ -331,7 +331,7 @@
                         }
                         else {
                             identityType=1;
-                            remark.append("取消党员活动扣除积分");
+                            remark.append("取消居民活动扣除积分");
                         }
 
                 }

--
Gitblit v1.7.1