From 1f7dff38fcc09e030e117ef3d344ad7592b7d7b1 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Fri, 17 Sep 2021 14:27:20 +0800
Subject: [PATCH] unescape to goods get the intro

---
 .../cn/lili/modules/goods/entity/dos/Goods.java | 17 +++++++++++++++++
 .../modules/promotion/entity/dos/Seckill.java   |  2 ++
 .../promotion/entity/dto/BasePromotion.java     |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
index 2ed4266c..03943a5b 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
@@ -1,6 +1,8 @@
 package cn.lili.modules.goods.entity.dos;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.http.HtmlUtil;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
@@ -247,4 +249,19 @@ public class Goods extends BaseEntity {
 
         }
     }
+
+    public String getIntro() {
+        if (CharSequenceUtil.isNotEmpty(intro)) {
+            return HtmlUtil.unescape(intro);
+        }
+        return intro;
+    }
+
+    public String getMobileIntro() {
+        if (CharSequenceUtil.isNotEmpty(mobileIntro)) {
+            return HtmlUtil.unescape(mobileIntro);
+        }
+        return mobileIntro;
+    }
+
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
index ee65fa79..3c6e770f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
@@ -21,6 +22,7 @@ import java.util.Date;
  * @author Chopper
  * @since 2020-03-19 10:44 上午
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("li_seckill")
 @ApiModel(value = "秒杀活动活动")
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java
index 77cd3be0..f9e5468e 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java
@@ -5,6 +5,7 @@ import cn.lili.mybatis.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.Date;
@@ -15,6 +16,7 @@ import java.util.Date;
  * @author Chopper
  * @since 2020-03-19 10:44 上午
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class BasePromotion extends BaseEntity {