Commit 7f5614dd authored by Smile's avatar Smile Committed by wux

bug184: (生产)【(APP/h5)】首页弹窗,无法文显示

parent cf675c2e
ALTER TABLE ecw_banner_pop
ADD COLUMN title_fr VARCHAR(64) NULL COMMENT '法文标题',
ADD COLUMN html_web_fr TEXT NULL COMMENT 'web网页法文',
ADD COLUMN html_app_fr TEXT NULL COMMENT 'app网页法文';
\ No newline at end of file
...@@ -27,6 +27,10 @@ public class BannerPopBackVO { ...@@ -27,6 +27,10 @@ public class BannerPopBackVO {
@ApiModelProperty(value = "英文标题") @ApiModelProperty(value = "英文标题")
private String titleEn; private String titleEn;
@ExcelProperty("英文法文")
@ApiModelProperty(value = "英文法文")
private String titleFr;
@ExcelProperty("有效期开始时间") @ExcelProperty("有效期开始时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "有效期开始时间") @ApiModelProperty(value = "有效期开始时间")
...@@ -45,6 +49,10 @@ public class BannerPopBackVO { ...@@ -45,6 +49,10 @@ public class BannerPopBackVO {
@ApiModelProperty(value = "web网页英文") @ApiModelProperty(value = "web网页英文")
private String htmlWebEn; private String htmlWebEn;
@ExcelProperty("web网页法文")
@ApiModelProperty(value = "web网页法文")
private String htmlWebFr;
@ExcelProperty("app网页中文") @ExcelProperty("app网页中文")
@ApiModelProperty(value = "app网页中文") @ApiModelProperty(value = "app网页中文")
private String htmlAppZh; private String htmlAppZh;
...@@ -53,6 +61,10 @@ public class BannerPopBackVO { ...@@ -53,6 +61,10 @@ public class BannerPopBackVO {
@ApiModelProperty(value = "app网页英文") @ApiModelProperty(value = "app网页英文")
private String htmlAppEn; private String htmlAppEn;
@ExcelProperty("app网页法文")
@ApiModelProperty(value = "app网页法文")
private String htmlAppFr;
@ExcelProperty("0显示 1不显示") @ExcelProperty("0显示 1不显示")
@ApiModelProperty(value = "0显示 1不显示") @ApiModelProperty(value = "0显示 1不显示")
private Integer status; private Integer status;
......
...@@ -23,6 +23,9 @@ public class BannerPopBaseVO { ...@@ -23,6 +23,9 @@ public class BannerPopBaseVO {
@ApiModelProperty(value = "英文标题") @ApiModelProperty(value = "英文标题")
private String titleEn; private String titleEn;
@ApiModelProperty(value = "法文标题")
private String titleFr;
@ApiModelProperty(value = "有效期开始时间") @ApiModelProperty(value = "有效期开始时间")
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
...@@ -39,12 +42,18 @@ public class BannerPopBaseVO { ...@@ -39,12 +42,18 @@ public class BannerPopBaseVO {
@ApiModelProperty(value = "web网页英文") @ApiModelProperty(value = "web网页英文")
private String htmlWebEn; private String htmlWebEn;
@ApiModelProperty(value = "web网页法文")
private String htmlWebFr;
@ApiModelProperty(value = "app网页中文") @ApiModelProperty(value = "app网页中文")
private String htmlAppZh; private String htmlAppZh;
@ApiModelProperty(value = "app网页英文") @ApiModelProperty(value = "app网页英文")
private String htmlAppEn; private String htmlAppEn;
@ApiModelProperty(value = "app网页法文")
private String htmlAppFr;
@ApiModelProperty(value = "0显示 1不显示") @ApiModelProperty(value = "0显示 1不显示")
private Integer status; private Integer status;
......
...@@ -19,6 +19,9 @@ public class BannerPopQueryVO { ...@@ -19,6 +19,9 @@ public class BannerPopQueryVO {
@ApiModelProperty(value = "英文标题") @ApiModelProperty(value = "英文标题")
private String titleEn; private String titleEn;
@ApiModelProperty(value = "英文法文")
private String titleFr;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "有效期开始时间") @ApiModelProperty(value = "有效期开始时间")
private Date validateStart; private Date validateStart;
...@@ -33,12 +36,18 @@ public class BannerPopQueryVO { ...@@ -33,12 +36,18 @@ public class BannerPopQueryVO {
@ApiModelProperty(value = "web网页英文") @ApiModelProperty(value = "web网页英文")
private String htmlWebEn; private String htmlWebEn;
@ApiModelProperty(value = "web网页法文")
private String htmlWebFr;
@ApiModelProperty(value = "app网页中文") @ApiModelProperty(value = "app网页中文")
private String htmlAppZh; private String htmlAppZh;
@ApiModelProperty(value = "app网页英文") @ApiModelProperty(value = "app网页英文")
private String htmlAppEn; private String htmlAppEn;
@ApiModelProperty(value = "app网页法文")
private String htmlAppFr;
@ApiModelProperty(value = "0显示 1不显示") @ApiModelProperty(value = "0显示 1不显示")
private Integer status; private Integer status;
......
...@@ -34,6 +34,10 @@ public class BannerPopDO extends BaseDO { ...@@ -34,6 +34,10 @@ public class BannerPopDO extends BaseDO {
* 英文标题 * 英文标题
*/ */
private String titleEn; private String titleEn;
/**
* 法文标题
*/
private String titleFr;
/** /**
* 有效期开始时间 * 有效期开始时间
*/ */
...@@ -50,6 +54,10 @@ public class BannerPopDO extends BaseDO { ...@@ -50,6 +54,10 @@ public class BannerPopDO extends BaseDO {
* web网页英文 * web网页英文
*/ */
private String htmlWebEn; private String htmlWebEn;
/**
* web网页法文
*/
private String htmlWebFr;
/** /**
* app网页中文 * app网页中文
*/ */
...@@ -58,6 +66,10 @@ public class BannerPopDO extends BaseDO { ...@@ -58,6 +66,10 @@ public class BannerPopDO extends BaseDO {
* app网页英文 * app网页英文
*/ */
private String htmlAppEn; private String htmlAppEn;
/**
* app网页法文
*/
private String htmlAppFr;
/** /**
* 0显示 1不显示 * 0显示 1不显示
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment