From 0c9ec42a824aa3242fe1e1b8ce372947f2bc9a03 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 七月 2024 17:43:06 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTargetoption.java | 88 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTargetoption.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTargetoption.java
index 2855ff3..224d36b 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTargetoption.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTargetoption.java
@@ -1,15 +1,15 @@
package com.smartor.domain;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 妯℃澘鎸囨爣閫夐」搴撳璞� ivr_liba_template_targetoption
@@ -68,7 +68,7 @@
*/
@Excel(name = "绫诲埆鍚嶇О")
@ApiModelProperty(value = "绫诲埆鍚嶇О")
- private String categoryName;
+ private String categoryName = null;
/**
* 妯℃澘鎸囨爣鍊�
@@ -83,6 +83,27 @@
@Excel(name = "妯℃澘鎸囨爣姝e垯")
@ApiModelProperty(value = "妯℃澘鎸囨爣姝e垯")
private String targetregex;
+
+ /**
+ * 妯℃澘鎸囨爣姝e垯
+ */
+ @Excel(name = "妯℃澘鎸囨爣姝e垯2")
+ @ApiModelProperty(value = "妯℃澘鎸囨爣姝e垯2")
+ private String targetregex2;
+
+ @Excel(name = "姝e垯鍏抽敭瀛楅泦鍚�(鍚�)")
+ private String nodynamiccruxsJson;
+
+ @Excel(name = "姝e垯鍏抽敭瀛楅泦鍚�(涓嶅惈)")
+ private String dynamiccruxsJson;
+
+ @ApiModelProperty(value = "姝e垯鍏抽敭瀛�(鍚�)")
+ @Excel(name = "姝e垯鍏抽敭瀛�(鍚�)")
+ private List<String> nodynamiccruxs = new ArrayList<>();
+
+ @ApiModelProperty(value = "姝e垯鍏抽敭瀛�(涓嶅惈)")
+ @Excel(name = "姝e垯鍏抽敭瀛�(涓嶅惈)")
+ private List<String> dynamiccruxs = new ArrayList<>();
/**
* 閫夐」鎻忚堪
@@ -119,19 +140,19 @@
@ApiModelProperty(value = "鏄惁寮傚父鏍囪瘑")
private Long isabnormal;
- /**
- * 棰勮闃�鍊间笂闄�
- */
- @Excel(name = "棰勮闃�鍊间笂闄�")
- @ApiModelProperty(value = "棰勮闃�鍊间笂闄�")
- private Long warnup;
-
- /**
- * 棰勮闃�鍊间笅闄�
- */
- @Excel(name = "棰勮闃�鍊间笅闄�")
- @ApiModelProperty(value = "棰勮闃�鍊间笅闄�")
- private Long warndown;
+// /**
+// * 棰勮闃�鍊间笂闄�
+// */
+// @Excel(name = "棰勮闃�鍊间笂闄�")
+// @ApiModelProperty(value = "棰勮闃�鍊间笂闄�")
+// private Long warnup;
+//
+// /**
+// * 棰勮闃�鍊间笅闄�
+// */
+// @Excel(name = "棰勮闃�鍊间笅闄�")
+// @ApiModelProperty(value = "棰勮闃�鍊间笅闄�")
+// private Long warndown;
/**
* 鍒犻櫎鏍囪
@@ -169,6 +190,13 @@
private Long pid;
/**
+ * 閫夐」缁彿
+ */
+ @Excel(name = "閫夐」缁彿")
+ @ApiModelProperty(value = "閫夐」缁彿")
+ private Long optionNo;
+
+ /**
* GUID
*/
@Excel(name = "GUID")
@@ -180,4 +208,24 @@
*/
@ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
private Integer isoperation;
+
+ /**
+ * 鏄惁鏄敤鎴烽�夋嫨鐨勯�夐」
+ */
+ @ApiModelProperty(value = "鏄惁鏄敤鎴烽�夋嫨鐨勯�夐」")
+ private Boolean isUserOperation = false;
+
+ /**
+ * 涓嬩竴棰�
+ */
+ @ApiModelProperty(value = "涓嬩竴棰�")
+ private Integer nextQuestion;
+
+ @ApiModelProperty(value = "閫夐」闄勫姞鏍囪瘑")
+ private String appendflag;
+
+ @ApiModelProperty(value = "闄勪欢淇℃伅")
+ private String appenddesc;
+
+
}
--
Gitblit v1.9.3