From db1ab110315f39805dc153706d6208f77903e88c Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Tue, 6 Jun 2023 22:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/skyeye/attr/classenum/DsFormShowType.java    | 2 ++
 .../java/com/skyeye/dsform/entity/DsFormComponent.java    | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/classenum/DsFormShowType.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/classenum/DsFormShowType.java
index 79409ffb..f659662e 100644
--- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/classenum/DsFormShowType.java
+++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/classenum/DsFormShowType.java
@@ -21,6 +21,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public enum DsFormShowType implements SkyeyeEnumClass {
+
+    CUSTOMER(-1, "自定义", true, false),
     TEXT(1, "文本展示", true, false),
     ENCLOSURE(2, "附件展示", true, false),
     RICH_TEXT(3, "富文本展示", true, false),
diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormComponent.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormComponent.java
index e3b5cd0a..85812b82 100644
--- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormComponent.java
+++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/dsform/entity/DsFormComponent.java
@@ -101,6 +101,14 @@ public class DsFormComponent extends IconOrImgInfo {
     @ApiModelProperty(value = "组件获取的值的合入接口入参的方式，参考#ComponentValueMergType", required = "required")
     private String valueMergType;
 
+    @TableField("detail_html_content")
+    @ApiModelProperty(value = "详情页面(showType=0)：组件的html内容")
+    private String detailHtmlContent;
+
+    @TableField("detail_js_content")
+    @ApiModelProperty(value = "详情页面(showType=0)：组件的js脚本")
+    private String detailJsContent;
+
     @TableField("remark")
     @ApiModelProperty(value = "组件备注")
     private String remark;