Merge remote-tracking branch 'origin/developerA' into developerA

base-module/src/main/java/com/caimei/module/base/entity/vo/HotSearchVo.java

@@ -4,6 +4,8 @@ import com.caimei.module.base.entity.po.CmPageHotSearch;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Map;
+
 /**
  * Description
  *
@@ -13,4 +15,12 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class HotSearchVo extends CmPageHotSearch {
+    /**
+     * 链接类型
+     */
+    private Integer linkType;
+    /**
+     * 链接参数
+     */
+    private Map<String, Object> linkParam;
 }