diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigSubscribe.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigSubscribe.java index 717976d00..c4f43cb02 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigSubscribe.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigSubscribe.java @@ -30,15 +30,16 @@ public class ActPageConfigSubscribe extends BaseEntity @Excel(name = "背景图片") private String bgImg; - /** 二维码图片 */ - @Excel(name = "二维码图片") - private String bgImg2; - /** 关注二维码描述 */ - @Excel(name = "关注二维码描述") + /** 二维码 */ + @Excel(name = "二维码") private String qrCode; - public void setId(Integer id) + public String getBgImg() { + return bgImg; + } + + public void setId(Integer id) { this.id = id; } @@ -70,19 +71,7 @@ public class ActPageConfigSubscribe extends BaseEntity this.bgImg = bgImg; } - public String getBgImg() - { - return bgImg; - } - public void setBgImg2(String bgImg2) - { - this.bgImg2 = bgImg2; - } - public String getBgImg2() - { - return bgImg2; - } public void setQrCode(String qrCode) { this.qrCode = qrCode; @@ -100,7 +89,6 @@ public class ActPageConfigSubscribe extends BaseEntity .append("actCode", getActCode()) .append("description", getDescription()) .append("bgImg", getBgImg()) - .append("bgImg2", getBgImg2()) .append("qrCode", getQrCode()) .append("createTime", getCreateTime()) .append("updateTime", getUpdateTime()) diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml index d49db90be..c1166a1d2 100644 --- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml +++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml @@ -9,14 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select id, act_code, description, bg_img, bg_img2, qr_code, create_time, update_time from act_page_config_subscribe + select id, act_code, description, bg_img, qr_code, create_time, update_time from act_page_config_subscribe @@ -41,7 +39,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" act_code, description, bg_img, - bg_img2, qr_code, create_time, update_time, @@ -50,7 +47,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{actCode}, #{description}, #{bgImg}, - #{bgImg2}, #{qrCode}, #{createTime}, #{updateTime}, @@ -63,7 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" act_code = #{actCode}, description = #{description}, bg_img = #{bgImg}, - bg_img2 = #{bgImg2}, qr_code = #{qrCode}, create_time = #{createTime}, update_time = #{updateTime}, diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/info/add.html index 706d996ba..0bbf2e171 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -661,7 +661,7 @@ onclick="updateText(this)">姓名