From 29d027349c605bda0b7944301cd82a25ec9c1d7a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 07 五月 2024 16:42:03 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
index 46b0e50..968ae44 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java
@@ -1,8 +1,12 @@
package com.smartor.domain;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.google.gson.Gson;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -47,9 +51,31 @@
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String targetvalue;
- @ApiModelProperty(value = "姝ｅ垯")
+ @ApiModelProperty(value = "姝ｅ垯1")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String targetregex;
+
+ @ApiModelProperty(value = "姝ｅ垯2")
+ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ private String targetregex2;
+
+
+ @Excel(name = "姝ｅ垯鍏抽敭瀛楅泦鍚�(鍚�)")
+ private String nodynamiccruxsJson;
+
+
+ @Excel(name = "姝ｅ垯鍏抽敭瀛楅泦鍚�(涓嶅惈)")
+ private String dynamiccruxsJson;
+
+ @ApiModelProperty(value = "姝ｅ垯鍏抽敭瀛�(鍚�)")
+ @Excel(name = "姝ｅ垯鍏抽敭瀛�(鍚�)")
+ @JsonFormat
+ private List<String> nodynamiccruxs = new ArrayList<>();
+
+ @ApiModelProperty(value = "姝ｅ垯鍏抽敭瀛�(涓嶅惈)")
+ @Excel(name = "姝ｅ垯鍏抽敭瀛�(涓嶅惈)")
+ @JsonFormat
+ private List<String> dynamiccruxs = new ArrayList<>();
@ApiModelProperty(value = "閫夐」鎻忚堪")
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -149,8 +175,4 @@
@Excel(name = "pageSize")
private Integer pageSize;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("targetoptionid", getTargetoptionid()).append("targetid", getTargetid()).append("targettype", getTargettype()).append("categoryName", getCategoryName()).append("targetvalue", getTargetvalue()).append("targetregex", getTargetregex()).append("optiondesc", getOptiondesc()).append("language", getLanguage()).append("version", getVersion()).append("groupid", getGroupid()).append("isabnormal", getIsabnormal()).append("warnup", getWarnup()).append("warndown", getWarndown()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("orgid", getOrgid()).append("pid", getPid()).append("guid", getGuid()).toString();
- }
}
--
Gitblit v1.9.3