diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindrule.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindrule.java index 8130530..0230c60 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindrule.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindrule.java @@ -38,9 +38,9 @@ public class MessageRemindrule extends BaseEntity { @ApiModelProperty("规则编码") private String ruleCode; @ApiModelProperty("提醒方式(事前提醒0,事后提醒1)") - private Integer rules; + private String rules; @ApiModelProperty("提醒时间间隔") - private Integer timeInterval; + private String timeInterval; @ApiModelProperty("提醒次数,超过次数不提醒") private String frequency; @ApiModelProperty("提醒渠道") diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleDto.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleDto.java index b064895..b449849 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleDto.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleDto.java @@ -28,9 +28,9 @@ public class MessageRemindruleDto implements Dto { @ApiModelProperty("规则编码") private String ruleCode; @ApiModelProperty("提醒方式(事前提醒0,事后提醒1)") - private Integer rules; + private String rules; @ApiModelProperty("提醒时间间隔") - private Integer timeInterval; + private String timeInterval; @ApiModelProperty("提醒次数,超过次数不提醒") private String frequency; @ApiModelProperty("提醒渠道") diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleInitVo.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleInitVo.java index fe3ff4e..c4c8611 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleInitVo.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleInitVo.java @@ -15,9 +15,9 @@ public class MessageRemindruleInitVo implements Vo { @ApiModelProperty("规则编码") private String ruleCode; @ApiModelProperty("提醒方式(事前提醒0,事后提醒1)") - private Integer rules; + private String rules; @ApiModelProperty("提醒时间间隔") - private Integer timeInterval; + private String timeInterval; @ApiModelProperty("提醒次数,超过次数不提醒") private String frequency; @ApiModelProperty("提醒渠道") diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleQuery.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleQuery.java index 91ef78b..f4b035e 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleQuery.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleQuery.java @@ -28,5 +28,5 @@ public class MessageRemindruleQuery implements Query { @ApiModelProperty("规则编码") private String ruleCode; @ApiModelProperty("提醒方式(事前提醒0,事后提醒1)") - private Integer rules; + private String rules; } diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleVo.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleVo.java index 7e730a2..ec26cd2 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleVo.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messageremindrule/MessageRemindruleVo.java @@ -28,9 +28,9 @@ public class MessageRemindruleVo implements Vo { @ApiModelProperty("规则编码") private String ruleCode; @ApiModelProperty("提醒方式(事前提醒0,事后提醒1)") - private Integer rules; + private String rules; @ApiModelProperty("提醒时间间隔") - private Integer timeInterval; + private String timeInterval; @ApiModelProperty("提醒次数,超过次数不提醒") private String frequency; @ApiModelProperty("提醒渠道") diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageremindrule/MessageRemindruleService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageremindrule/MessageRemindruleService.java index 1e12e47..6eec910 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageremindrule/MessageRemindruleService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messageremindrule/MessageRemindruleService.java @@ -54,7 +54,7 @@ public class MessageRemindruleService extends MybatisBaseService