From fee41215cd6f7243ba09e2a1caf927f372d12c70 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 5 Nov 2020 15:22:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BE=BD=E7=AB=A0?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/UserBadgeServiceImpl.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
index c4f09a941a..986d9eed7f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
@@ -245,10 +245,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                         }
                     });
                 });
-                userBadgeRedis.setCustomerBadge(resultUserBadge, customerId);
-            }else {
-                userBadgeRedis.setCustomerBadge(resultUserBadge, customerId);
             }
+            userBadgeRedis.setCustomerBadge(resultUserBadge, customerId);
         }
     }
 

From f6fd212bf5d18872d732737d496be1259e56cebf Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Thu, 5 Nov 2020 15:30:12 +0800
Subject: [PATCH 2/2] fix

---
 .../src/main/java/com/epmet/entity/UserAdviceEntity.java   | 7 ++++---
 .../main/java/com/epmet/entity/UserAdviceImgEntity.java    | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java
index 720692b778..dcf168cc2d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java
@@ -19,7 +19,8 @@ package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import com.epmet.commons.mybatis.entity.BaseEpdcEntity;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -34,7 +35,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("user_advice")
-public class UserAdviceEntity extends BaseEpdcEntity {
+public class UserAdviceEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -78,4 +79,4 @@ public class UserAdviceEntity extends BaseEpdcEntity {
      */
 	private Date replyTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java
index c899502c84..a507b96b38 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceImgEntity.java
@@ -19,7 +19,7 @@ package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import com.epmet.commons.mybatis.entity.BaseEpdcEntity;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -34,7 +34,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("user_advice_img")
-public class UserAdviceImgEntity extends BaseEpdcEntity {
+public class UserAdviceImgEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -48,4 +48,4 @@ public class UserAdviceImgEntity extends BaseEpdcEntity {
      */
 	private String imgUrl;
 
-}
\ No newline at end of file
+}