From 27c3f725f9bbd51e97857de6cc191d016b660bd6 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 18 七月 2024 18:01:39 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/domain/IvrLibaTargetoption.java | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 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..25f793e 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 = "姝e垯") + @ApiModelProperty(value = "姝e垯1") @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String targetregex; + + @ApiModelProperty(value = "姝e垯2") + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String targetregex2; + + + @Excel(name = "姝e垯鍏抽敭瀛楅泦鍚�(鍚�)") + private String nodynamiccruxsJson; + + + @Excel(name = "姝e垯鍏抽敭瀛楅泦鍚�(涓嶅惈)") + private String dynamiccruxsJson; + + @ApiModelProperty(value = "姝e垯鍏抽敭瀛�(鍚�)") + @Excel(name = "姝e垯鍏抽敭瀛�(鍚�)") + @JsonFormat + private List<String> nodynamiccruxs = new ArrayList<>(); + + @ApiModelProperty(value = "姝e垯鍏抽敭瀛�(涓嶅惈)") + @Excel(name = "姝e垯鍏抽敭瀛�(涓嶅惈)") + @JsonFormat + private List<String> dynamiccruxs = new ArrayList<>(); @ApiModelProperty(value = "閫夐」鎻忚堪") @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @@ -87,6 +113,13 @@ @ApiModelProperty(value = "棰勮闃�鍊间笅闄�") @Excel(name = "棰勮闃�鍊间笅闄�") private Long warndown; + + /** + * 椤哄簭搴忓彿 + */ + @ApiModelProperty(value = "椤哄簭搴忓彿") + @Excel(name = "椤哄簭搴忓彿") + private Long orderno; /** * 鍒犻櫎鏍囪 @@ -135,6 +168,12 @@ @ApiModelProperty(value = "鎬绘潯鏁�") private Integer allitems; + + @ApiModelProperty(value = "閫夐」闄勫姞鏍囪瘑") + private String appendflag; + + @ApiModelProperty(value = "闄勪欢淇℃伅") + private String appenddesc; /** * pageNum */ @@ -149,8 +188,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