Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

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;
 

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;
 

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);
         }
     }