From 188629e94d9d4c0f8745e9b0f440b36c68aa63b0 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 12 Jan 2021 13:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=89=80=E6=9C=89=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=9A=84=E4=B8=8A=E9=99=90=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8F=8F=E8=BF=B0=E3=80=81=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=85=A5=E7=BB=84=E7=9A=84=E5=85=A5=E7=BE=A4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=8D=E7=AE=A1=E6=98=AF=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=BF=98=E6=98=AF=E5=AE=A1=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=EF=BC=8C=E8=BF=9B=E7=BE=A4=E6=8F=8F=E8=BF=B0=E4=B8=80?=
 =?UTF-8?q?=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V0.0.7__updateAllRuleLimitDesc.sql   | 2 ++
 .../member/service/impl/GroupMemeberOperationServiceImpl.java   | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.7__updateAllRuleLimitDesc.sql

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.7__updateAllRuleLimitDesc.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.7__updateAllRuleLimitDesc.sql
new file mode 100644
index 0000000000..c3726ce7b3
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.7__updateAllRuleLimitDesc.sql
@@ -0,0 +1,2 @@
+update `point_rule_default` set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限';
+update `point_rule` 				set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限'
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
index 60a9c6c76e..11760b07b3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
@@ -297,7 +297,6 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
         UserRoleDTO userRoleDTO = getUserRoleDTO(userRoleResponse.getData());
         //新增一条邀请入群、直接审核通过的入群记录
         groupMemeberOperation.setOperateStatus(MemberStateConstant.APPROVED);
-        groupMemeberOperation.setOperateDes("通过分享链接入组，入组审核开关关闭，直接入组");
         save(groupMemeberOperation);
         result.setStatus("entered");
         //发送积分事件