diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index d343a8e02..5f1cee010 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.105.105.125:3306/intermarketing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: intermarketing
-                password: ?intermarketing123?
+                url: jdbc:mysql://localhost:3306/intermarketing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password:
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/ActConfig.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActConfig.java
new file mode 100644
index 000000000..d89cf4c32
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActConfig.java
@@ -0,0 +1,151 @@
+package com.sinosoft.activity.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 活动配置对象 act_config
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+public class ActConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Integer id;
+
+    /** 页面风格 */
+    @Excel(name = "页面风格")
+    private Integer pageStyle;
+
+    /** 活动类型 */
+    @Excel(name = "活动类型")
+    private Integer actType;
+
+    /** 活动编码 */
+    @Excel(name = "活动编码")
+    private String actCode;
+
+    /** 活动名称 */
+    @Excel(name = "活动名称")
+    private String actName;
+
+    /** 分享标题 */
+    @Excel(name = "分享标题")
+    private String shareTitle;
+
+    /** 分享描述 */
+    @Excel(name = "分享描述")
+    private String shareDesc;
+
+    /** 分享链接 */
+    @Excel(name = "分享链接")
+    private String shareLink;
+
+    /** 分享图标 */
+    @Excel(name = "分享图标")
+    private String shareImg;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setPageStyle(Integer pageStyle) 
+    {
+        this.pageStyle = pageStyle;
+    }
+
+    public Integer getPageStyle() 
+    {
+        return pageStyle;
+    }
+    public void setActType(Integer actType) 
+    {
+        this.actType = actType;
+    }
+
+    public Integer getActType() 
+    {
+        return actType;
+    }
+    public void setActCode(String actCode) 
+    {
+        this.actCode = actCode;
+    }
+
+    public String getActCode() 
+    {
+        return actCode;
+    }
+    public void setActName(String actName) 
+    {
+        this.actName = actName;
+    }
+
+    public String getActName() 
+    {
+        return actName;
+    }
+    public void setShareTitle(String shareTitle) 
+    {
+        this.shareTitle = shareTitle;
+    }
+
+    public String getShareTitle() 
+    {
+        return shareTitle;
+    }
+    public void setShareDesc(String shareDesc) 
+    {
+        this.shareDesc = shareDesc;
+    }
+
+    public String getShareDesc() 
+    {
+        return shareDesc;
+    }
+    public void setShareLink(String shareLink) 
+    {
+        this.shareLink = shareLink;
+    }
+
+    public String getShareLink() 
+    {
+        return shareLink;
+    }
+    public void setShareImg(String shareImg) 
+    {
+        this.shareImg = shareImg;
+    }
+
+    public String getShareImg() 
+    {
+        return shareImg;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("pageStyle", getPageStyle())
+            .append("actType", getActType())
+            .append("actCode", getActCode())
+            .append("actName", getActName())
+            .append("shareTitle", getShareTitle())
+            .append("shareDesc", getShareDesc())
+            .append("shareLink", getShareLink())
+            .append("shareImg", getShareImg())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigGuide.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigGuide.java
index 71b1ea660..281e0d14d 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigGuide.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigGuide.java
@@ -34,14 +34,22 @@ public class ActPageConfigGuide extends BaseEntity
     @Excel(name = "背景图片")
     private String bgImg;
 
-    /** 按钮文本 */
-    @Excel(name = "按钮文本")
+    /** 按钮文本1 */
+    @Excel(name = "按钮文本1")
     private String btnText;
 
-    /** 按钮链接 */
-    @Excel(name = "按钮链接")
+    /** 按钮链接1 */
+    @Excel(name = "按钮链接1")
     private String btnLink;
 
+    /** 按钮链接2 */
+    @Excel(name = "按钮链接2")
+    private String btnLink2;
+
+    /** 按钮文本2 */
+    @Excel(name = "按钮文本2")
+    private String btnText2;
+
     public void setId(Integer id) 
     {
         this.id = id;
@@ -105,6 +113,24 @@ public class ActPageConfigGuide extends BaseEntity
     {
         return btnLink;
     }
+    public void setBtnLink2(String btnLink2) 
+    {
+        this.btnLink2 = btnLink2;
+    }
+
+    public String getBtnLink2() 
+    {
+        return btnLink2;
+    }
+    public void setBtnText2(String btnText2) 
+    {
+        this.btnText2 = btnText2;
+    }
+
+    public String getBtnText2() 
+    {
+        return btnText2;
+    }
 
     @Override
     public String toString() {
@@ -116,6 +142,8 @@ public class ActPageConfigGuide extends BaseEntity
             .append("bgImg", getBgImg())
             .append("btnText", getBtnText())
             .append("btnLink", getBtnLink())
+            .append("btnLink2", getBtnLink2())
+            .append("btnText2", getBtnText2())
             .append("createTime", getCreateTime())
             .append("updateTime", getUpdateTime())
             .toString();
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
new file mode 100644
index 000000000..31629a035
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigSubscribe.java
@@ -0,0 +1,109 @@
+package com.sinosoft.activity.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 活动收集配置对象 act_page_config_subscribe
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+public class ActPageConfigSubscribe extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Integer id;
+
+    /**  */
+    @Excel(name = "")
+    private String actCode;
+
+    /**  */
+    @Excel(name = "")
+    private String description;
+
+    /**  */
+    @Excel(name = "")
+    private String bgImg;
+
+    /**  */
+    @Excel(name = "")
+    private String bgImg2;
+
+    /**  */
+    @Excel(name = "")
+    private String qrCode;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setActCode(String actCode) 
+    {
+        this.actCode = actCode;
+    }
+
+    public String getActCode() 
+    {
+        return actCode;
+    }
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+    public void setBgImg(String bgImg) 
+    {
+        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;
+    }
+
+    public String getQrCode() 
+    {
+        return qrCode;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("actCode", getActCode())
+            .append("description", getDescription())
+            .append("bgImg", getBgImg())
+            .append("bgImg2", getBgImg2())
+            .append("qrCode", getQrCode())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java
new file mode 100644
index 000000000..e2ba8c18a
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java
@@ -0,0 +1,249 @@
+package com.sinosoft.activity.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 活动用户信息对象 act_page_config_userinfo
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+public class ActPageConfigUserinfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Integer id;
+
+    /**  */
+    @Excel(name = "")
+    private String actCode;
+
+    /**  */
+    @Excel(name = "")
+    private String title;
+
+    /**  */
+    @Excel(name = "")
+    private String description;
+
+    /**  */
+    @Excel(name = "")
+    private String bgImg;
+
+    /**  */
+    @Excel(name = "")
+    private String btnText;
+
+    /**  */
+    @Excel(name = "")
+    private String btnLink;
+
+    /**  */
+    @Excel(name = "")
+    private String agreement;
+
+    /**  */
+    @Excel(name = "")
+    private String userName;
+
+    /**  */
+    @Excel(name = "")
+    private String mobile;
+
+    /**  */
+    @Excel(name = "")
+    private String gender;
+
+    /**  */
+    @Excel(name = "")
+    private String address;
+
+    /**  */
+    @Excel(name = "")
+    private String agentName;
+
+    /**  */
+    @Excel(name = "")
+    private String agentMobile;
+
+    /**  */
+    @Excel(name = "")
+    private String agentGender;
+
+    /**  */
+    @Excel(name = "")
+    private String agentNo;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setActCode(String actCode) 
+    {
+        this.actCode = actCode;
+    }
+
+    public String getActCode() 
+    {
+        return actCode;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+    public void setBgImg(String bgImg) 
+    {
+        this.bgImg = bgImg;
+    }
+
+    public String getBgImg() 
+    {
+        return bgImg;
+    }
+    public void setBtnText(String btnText) 
+    {
+        this.btnText = btnText;
+    }
+
+    public String getBtnText() 
+    {
+        return btnText;
+    }
+    public void setBtnLink(String btnLink) 
+    {
+        this.btnLink = btnLink;
+    }
+
+    public String getBtnLink() 
+    {
+        return btnLink;
+    }
+    public void setAgreement(String agreement) 
+    {
+        this.agreement = agreement;
+    }
+
+    public String getAgreement() 
+    {
+        return agreement;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setMobile(String mobile) 
+    {
+        this.mobile = mobile;
+    }
+
+    public String getMobile() 
+    {
+        return mobile;
+    }
+    public void setGender(String gender) 
+    {
+        this.gender = gender;
+    }
+
+    public String getGender() 
+    {
+        return gender;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setAgentName(String agentName) 
+    {
+        this.agentName = agentName;
+    }
+
+    public String getAgentName() 
+    {
+        return agentName;
+    }
+    public void setAgentMobile(String agentMobile) 
+    {
+        this.agentMobile = agentMobile;
+    }
+
+    public String getAgentMobile() 
+    {
+        return agentMobile;
+    }
+    public void setAgentGender(String agentGender) 
+    {
+        this.agentGender = agentGender;
+    }
+
+    public String getAgentGender() 
+    {
+        return agentGender;
+    }
+    public void setAgentNo(String agentNo) 
+    {
+        this.agentNo = agentNo;
+    }
+
+    public String getAgentNo() 
+    {
+        return agentNo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("actCode", getActCode())
+            .append("title", getTitle())
+            .append("description", getDescription())
+            .append("bgImg", getBgImg())
+            .append("btnText", getBtnText())
+            .append("btnLink", getBtnLink())
+            .append("agreement", getAgreement())
+            .append("userName", getUserName())
+            .append("mobile", getMobile())
+            .append("gender", getGender())
+            .append("address", getAddress())
+            .append("agentName", getAgentName())
+            .append("agentMobile", getAgentMobile())
+            .append("agentGender", getAgentGender())
+            .append("agentNo", getAgentNo())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActConfigMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActConfigMapper.java
new file mode 100644
index 000000000..d4ca017fa
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActConfigMapper.java
@@ -0,0 +1,61 @@
+package com.sinosoft.activity.mapper;
+
+import java.util.List;
+import com.sinosoft.activity.domain.ActConfig;
+
+/**
+ * 活动配置Mapper接口
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+public interface ActConfigMapper 
+{
+    /**
+     * 查询活动配置
+     * 
+     * @param id 活动配置ID
+     * @return 活动配置
+     */
+    public ActConfig selectActConfigById(Integer id);
+
+    /**
+     * 查询活动配置列表
+     * 
+     * @param actConfig 活动配置
+     * @return 活动配置集合
+     */
+    public List<ActConfig> selectActConfigList(ActConfig actConfig);
+
+    /**
+     * 新增活动配置
+     * 
+     * @param actConfig 活动配置
+     * @return 结果
+     */
+    public int insertActConfig(ActConfig actConfig);
+
+    /**
+     * 修改活动配置
+     * 
+     * @param actConfig 活动配置
+     * @return 结果
+     */
+    public int updateActConfig(ActConfig actConfig);
+
+    /**
+     * 删除活动配置
+     * 
+     * @param id 活动配置ID
+     * @return 结果
+     */
+    public int deleteActConfigById(Integer id);
+
+    /**
+     * 批量删除活动配置
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteActConfigByIds(String[] ids);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigSubscribeMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigSubscribeMapper.java
new file mode 100644
index 000000000..23631c9f2
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigSubscribeMapper.java
@@ -0,0 +1,61 @@
+package com.sinosoft.activity.mapper;
+
+import java.util.List;
+import com.sinosoft.activity.domain.ActPageConfigSubscribe;
+
+/**
+ * 活动收集配置Mapper接口
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+public interface ActPageConfigSubscribeMapper 
+{
+    /**
+     * 查询活动收集配置
+     * 
+     * @param id 活动收集配置ID
+     * @return 活动收集配置
+     */
+    public ActPageConfigSubscribe selectActPageConfigSubscribeById(Integer id);
+
+    /**
+     * 查询活动收集配置列表
+     * 
+     * @param actPageConfigSubscribe 活动收集配置
+     * @return 活动收集配置集合
+     */
+    public List<ActPageConfigSubscribe> selectActPageConfigSubscribeList(ActPageConfigSubscribe actPageConfigSubscribe);
+
+    /**
+     * 新增活动收集配置
+     * 
+     * @param actPageConfigSubscribe 活动收集配置
+     * @return 结果
+     */
+    public int insertActPageConfigSubscribe(ActPageConfigSubscribe actPageConfigSubscribe);
+
+    /**
+     * 修改活动收集配置
+     * 
+     * @param actPageConfigSubscribe 活动收集配置
+     * @return 结果
+     */
+    public int updateActPageConfigSubscribe(ActPageConfigSubscribe actPageConfigSubscribe);
+
+    /**
+     * 删除活动收集配置
+     * 
+     * @param id 活动收集配置ID
+     * @return 结果
+     */
+    public int deleteActPageConfigSubscribeById(Integer id);
+
+    /**
+     * 批量删除活动收集配置
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteActPageConfigSubscribeByIds(String[] ids);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigUserinfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigUserinfoMapper.java
new file mode 100644
index 000000000..16dd8cac1
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/ActPageConfigUserinfoMapper.java
@@ -0,0 +1,61 @@
+package com.sinosoft.activity.mapper;
+
+import java.util.List;
+import com.sinosoft.activity.domain.ActPageConfigUserinfo;
+
+/**
+ * 活动用户信息Mapper接口
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+public interface ActPageConfigUserinfoMapper 
+{
+    /**
+     * 查询活动用户信息
+     * 
+     * @param id 活动用户信息ID
+     * @return 活动用户信息
+     */
+    public ActPageConfigUserinfo selectActPageConfigUserinfoById(Integer id);
+
+    /**
+     * 查询活动用户信息列表
+     * 
+     * @param actPageConfigUserinfo 活动用户信息
+     * @return 活动用户信息集合
+     */
+    public List<ActPageConfigUserinfo> selectActPageConfigUserinfoList(ActPageConfigUserinfo actPageConfigUserinfo);
+
+    /**
+     * 新增活动用户信息
+     * 
+     * @param actPageConfigUserinfo 活动用户信息
+     * @return 结果
+     */
+    public int insertActPageConfigUserinfo(ActPageConfigUserinfo actPageConfigUserinfo);
+
+    /**
+     * 修改活动用户信息
+     * 
+     * @param actPageConfigUserinfo 活动用户信息
+     * @return 结果
+     */
+    public int updateActPageConfigUserinfo(ActPageConfigUserinfo actPageConfigUserinfo);
+
+    /**
+     * 删除活动用户信息
+     * 
+     * @param id 活动用户信息ID
+     * @return 结果
+     */
+    public int deleteActPageConfigUserinfoById(Integer id);
+
+    /**
+     * 批量删除活动用户信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteActPageConfigUserinfoByIds(String[] ids);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IActConfigService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IActConfigService.java
new file mode 100644
index 000000000..5ba07afcf
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IActConfigService.java
@@ -0,0 +1,61 @@
+package com.sinosoft.activity.service;
+
+import java.util.List;
+import com.sinosoft.activity.domain.ActConfig;
+
+/**
+ * 活动配置Service接口
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+public interface IActConfigService 
+{
+    /**
+     * 查询活动配置
+     * 
+     * @param id 活动配置ID
+     * @return 活动配置
+     */
+    public ActConfig selectActConfigById(Integer id);
+
+    /**
+     * 查询活动配置列表
+     * 
+     * @param actConfig 活动配置
+     * @return 活动配置集合
+     */
+    public List<ActConfig> selectActConfigList(ActConfig actConfig);
+
+    /**
+     * 新增活动配置
+     * 
+     * @param actConfig 活动配置
+     * @return 结果
+     */
+    public int insertActConfig(ActConfig actConfig);
+
+    /**
+     * 修改活动配置
+     * 
+     * @param actConfig 活动配置
+     * @return 结果
+     */
+    public int updateActConfig(ActConfig actConfig);
+
+    /**
+     * 批量删除活动配置
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteActConfigByIds(String ids);
+
+    /**
+     * 删除活动配置信息
+     * 
+     * @param id 活动配置ID
+     * @return 结果
+     */
+    public int deleteActConfigById(Integer id);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigSubscribeService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigSubscribeService.java
new file mode 100644
index 000000000..d1fff55a3
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigSubscribeService.java
@@ -0,0 +1,61 @@
+package com.sinosoft.activity.service;
+
+import java.util.List;
+import com.sinosoft.activity.domain.ActPageConfigSubscribe;
+
+/**
+ * 活动收集配置Service接口
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+public interface IActPageConfigSubscribeService 
+{
+    /**
+     * 查询活动收集配置
+     * 
+     * @param id 活动收集配置ID
+     * @return 活动收集配置
+     */
+    public ActPageConfigSubscribe selectActPageConfigSubscribeById(Integer id);
+
+    /**
+     * 查询活动收集配置列表
+     * 
+     * @param actPageConfigSubscribe 活动收集配置
+     * @return 活动收集配置集合
+     */
+    public List<ActPageConfigSubscribe> selectActPageConfigSubscribeList(ActPageConfigSubscribe actPageConfigSubscribe);
+
+    /**
+     * 新增活动收集配置
+     * 
+     * @param actPageConfigSubscribe 活动收集配置
+     * @return 结果
+     */
+    public int insertActPageConfigSubscribe(ActPageConfigSubscribe actPageConfigSubscribe);
+
+    /**
+     * 修改活动收集配置
+     * 
+     * @param actPageConfigSubscribe 活动收集配置
+     * @return 结果
+     */
+    public int updateActPageConfigSubscribe(ActPageConfigSubscribe actPageConfigSubscribe);
+
+    /**
+     * 批量删除活动收集配置
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteActPageConfigSubscribeByIds(String ids);
+
+    /**
+     * 删除活动收集配置信息
+     * 
+     * @param id 活动收集配置ID
+     * @return 结果
+     */
+    public int deleteActPageConfigSubscribeById(Integer id);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigUserinfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigUserinfoService.java
new file mode 100644
index 000000000..747ec3eb2
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IActPageConfigUserinfoService.java
@@ -0,0 +1,61 @@
+package com.sinosoft.activity.service;
+
+import java.util.List;
+import com.sinosoft.activity.domain.ActPageConfigUserinfo;
+
+/**
+ * 活动用户信息Service接口
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+public interface IActPageConfigUserinfoService 
+{
+    /**
+     * 查询活动用户信息
+     * 
+     * @param id 活动用户信息ID
+     * @return 活动用户信息
+     */
+    public ActPageConfigUserinfo selectActPageConfigUserinfoById(Integer id);
+
+    /**
+     * 查询活动用户信息列表
+     * 
+     * @param actPageConfigUserinfo 活动用户信息
+     * @return 活动用户信息集合
+     */
+    public List<ActPageConfigUserinfo> selectActPageConfigUserinfoList(ActPageConfigUserinfo actPageConfigUserinfo);
+
+    /**
+     * 新增活动用户信息
+     * 
+     * @param actPageConfigUserinfo 活动用户信息
+     * @return 结果
+     */
+    public int insertActPageConfigUserinfo(ActPageConfigUserinfo actPageConfigUserinfo);
+
+    /**
+     * 修改活动用户信息
+     * 
+     * @param actPageConfigUserinfo 活动用户信息
+     * @return 结果
+     */
+    public int updateActPageConfigUserinfo(ActPageConfigUserinfo actPageConfigUserinfo);
+
+    /**
+     * 批量删除活动用户信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteActPageConfigUserinfoByIds(String ids);
+
+    /**
+     * 删除活动用户信息信息
+     * 
+     * @param id 活动用户信息ID
+     * @return 结果
+     */
+    public int deleteActPageConfigUserinfoById(Integer id);
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java
new file mode 100644
index 000000000..a6af57899
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java
@@ -0,0 +1,97 @@
+package com.sinosoft.activity.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.sinosoft.activity.mapper.ActConfigMapper;
+import com.sinosoft.activity.domain.ActConfig;
+import com.sinosoft.activity.service.IActConfigService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 活动配置Service业务层处理
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+@Service
+public class ActConfigServiceImpl implements IActConfigService 
+{
+    @Autowired
+    private ActConfigMapper actConfigMapper;
+
+    /**
+     * 查询活动配置
+     * 
+     * @param id 活动配置ID
+     * @return 活动配置
+     */
+    @Override
+    public ActConfig selectActConfigById(Integer id)
+    {
+        return actConfigMapper.selectActConfigById(id);
+    }
+
+    /**
+     * 查询活动配置列表
+     * 
+     * @param actConfig 活动配置
+     * @return 活动配置
+     */
+    @Override
+    public List<ActConfig> selectActConfigList(ActConfig actConfig)
+    {
+        return actConfigMapper.selectActConfigList(actConfig);
+    }
+
+    /**
+     * 新增活动配置
+     * 
+     * @param actConfig 活动配置
+     * @return 结果
+     */
+    @Override
+    public int insertActConfig(ActConfig actConfig)
+    {
+        actConfig.setCreateTime(DateUtils.getNowDate());
+        return actConfigMapper.insertActConfig(actConfig);
+    }
+
+    /**
+     * 修改活动配置
+     * 
+     * @param actConfig 活动配置
+     * @return 结果
+     */
+    @Override
+    public int updateActConfig(ActConfig actConfig)
+    {
+        actConfig.setUpdateTime(DateUtils.getNowDate());
+        return actConfigMapper.updateActConfig(actConfig);
+    }
+
+    /**
+     * 删除活动配置对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteActConfigByIds(String ids)
+    {
+        return actConfigMapper.deleteActConfigByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除活动配置信息
+     * 
+     * @param id 活动配置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteActConfigById(Integer id)
+    {
+        return actConfigMapper.deleteActConfigById(id);
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java
new file mode 100644
index 000000000..45c62dd27
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java
@@ -0,0 +1,97 @@
+package com.sinosoft.activity.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.sinosoft.activity.mapper.ActPageConfigSubscribeMapper;
+import com.sinosoft.activity.domain.ActPageConfigSubscribe;
+import com.sinosoft.activity.service.IActPageConfigSubscribeService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 活动收集配置Service业务层处理
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+@Service
+public class ActPageConfigSubscribeServiceImpl implements IActPageConfigSubscribeService 
+{
+    @Autowired
+    private ActPageConfigSubscribeMapper actPageConfigSubscribeMapper;
+
+    /**
+     * 查询活动收集配置
+     * 
+     * @param id 活动收集配置ID
+     * @return 活动收集配置
+     */
+    @Override
+    public ActPageConfigSubscribe selectActPageConfigSubscribeById(Integer id)
+    {
+        return actPageConfigSubscribeMapper.selectActPageConfigSubscribeById(id);
+    }
+
+    /**
+     * 查询活动收集配置列表
+     * 
+     * @param actPageConfigSubscribe 活动收集配置
+     * @return 活动收集配置
+     */
+    @Override
+    public List<ActPageConfigSubscribe> selectActPageConfigSubscribeList(ActPageConfigSubscribe actPageConfigSubscribe)
+    {
+        return actPageConfigSubscribeMapper.selectActPageConfigSubscribeList(actPageConfigSubscribe);
+    }
+
+    /**
+     * 新增活动收集配置
+     * 
+     * @param actPageConfigSubscribe 活动收集配置
+     * @return 结果
+     */
+    @Override
+    public int insertActPageConfigSubscribe(ActPageConfigSubscribe actPageConfigSubscribe)
+    {
+        actPageConfigSubscribe.setCreateTime(DateUtils.getNowDate());
+        return actPageConfigSubscribeMapper.insertActPageConfigSubscribe(actPageConfigSubscribe);
+    }
+
+    /**
+     * 修改活动收集配置
+     * 
+     * @param actPageConfigSubscribe 活动收集配置
+     * @return 结果
+     */
+    @Override
+    public int updateActPageConfigSubscribe(ActPageConfigSubscribe actPageConfigSubscribe)
+    {
+        actPageConfigSubscribe.setUpdateTime(DateUtils.getNowDate());
+        return actPageConfigSubscribeMapper.updateActPageConfigSubscribe(actPageConfigSubscribe);
+    }
+
+    /**
+     * 删除活动收集配置对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteActPageConfigSubscribeByIds(String ids)
+    {
+        return actPageConfigSubscribeMapper.deleteActPageConfigSubscribeByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除活动收集配置信息
+     * 
+     * @param id 活动收集配置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteActPageConfigSubscribeById(Integer id)
+    {
+        return actPageConfigSubscribeMapper.deleteActPageConfigSubscribeById(id);
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java
new file mode 100644
index 000000000..d68fd8f72
--- /dev/null
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java
@@ -0,0 +1,97 @@
+package com.sinosoft.activity.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.sinosoft.activity.mapper.ActPageConfigUserinfoMapper;
+import com.sinosoft.activity.domain.ActPageConfigUserinfo;
+import com.sinosoft.activity.service.IActPageConfigUserinfoService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 活动用户信息Service业务层处理
+ * 
+ * @author dy
+ * @date 2021-04-08
+ */
+@Service
+public class ActPageConfigUserinfoServiceImpl implements IActPageConfigUserinfoService 
+{
+    @Autowired
+    private ActPageConfigUserinfoMapper actPageConfigUserinfoMapper;
+
+    /**
+     * 查询活动用户信息
+     * 
+     * @param id 活动用户信息ID
+     * @return 活动用户信息
+     */
+    @Override
+    public ActPageConfigUserinfo selectActPageConfigUserinfoById(Integer id)
+    {
+        return actPageConfigUserinfoMapper.selectActPageConfigUserinfoById(id);
+    }
+
+    /**
+     * 查询活动用户信息列表
+     * 
+     * @param actPageConfigUserinfo 活动用户信息
+     * @return 活动用户信息
+     */
+    @Override
+    public List<ActPageConfigUserinfo> selectActPageConfigUserinfoList(ActPageConfigUserinfo actPageConfigUserinfo)
+    {
+        return actPageConfigUserinfoMapper.selectActPageConfigUserinfoList(actPageConfigUserinfo);
+    }
+
+    /**
+     * 新增活动用户信息
+     * 
+     * @param actPageConfigUserinfo 活动用户信息
+     * @return 结果
+     */
+    @Override
+    public int insertActPageConfigUserinfo(ActPageConfigUserinfo actPageConfigUserinfo)
+    {
+        actPageConfigUserinfo.setCreateTime(DateUtils.getNowDate());
+        return actPageConfigUserinfoMapper.insertActPageConfigUserinfo(actPageConfigUserinfo);
+    }
+
+    /**
+     * 修改活动用户信息
+     * 
+     * @param actPageConfigUserinfo 活动用户信息
+     * @return 结果
+     */
+    @Override
+    public int updateActPageConfigUserinfo(ActPageConfigUserinfo actPageConfigUserinfo)
+    {
+        actPageConfigUserinfo.setUpdateTime(DateUtils.getNowDate());
+        return actPageConfigUserinfoMapper.updateActPageConfigUserinfo(actPageConfigUserinfo);
+    }
+
+    /**
+     * 删除活动用户信息对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteActPageConfigUserinfoByIds(String ids)
+    {
+        return actPageConfigUserinfoMapper.deleteActPageConfigUserinfoByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除活动用户信息信息
+     * 
+     * @param id 活动用户信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteActPageConfigUserinfoById(Integer id)
+    {
+        return actPageConfigUserinfoMapper.deleteActPageConfigUserinfoById(id);
+    }
+}
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/vo/ActVO.java b/sino-activity/src/main/java/com/sinosoft/activity/vo/ActVO.java
index 3f39ece50..2c7fbbe6d 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/vo/ActVO.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/vo/ActVO.java
@@ -1,8 +1,6 @@
 package com.sinosoft.activity.vo;
 
 import com.ruoyi.common.core.domain.BaseEntity;
-import com.sinosoft.activity.domain.ActPageConfigGuide;
-import com.sinosoft.activity.domain.DrawInfo;
 
 /**
  * 活动主类
@@ -17,11 +15,9 @@ public class ActVO extends BaseEntity {
     /**
      * 第三步--活动展示内容配置
      */
-    ActPageConfigGuide actPageConfigGuide;
     /**
      * 第一步 第四步
      */
-    DrawInfo drawInfo;
 
 
 
diff --git a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml
new file mode 100644
index 000000000..979c73ba8
--- /dev/null
+++ b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sinosoft.activity.mapper.ActConfigMapper">
+    
+    <resultMap type="ActConfig" id="ActConfigResult">
+        <result property="id"    column="id"    />
+        <result property="pageStyle"    column="page_style"    />
+        <result property="actType"    column="act_type"    />
+        <result property="actCode"    column="act_code"    />
+        <result property="actName"    column="act_name"    />
+        <result property="shareTitle"    column="share_title"    />
+        <result property="shareDesc"    column="share_desc"    />
+        <result property="shareLink"    column="share_link"    />
+        <result property="shareImg"    column="share_img"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectActConfigVo">
+        select id, page_style, act_type, act_code, act_name, share_title, share_desc, share_link, share_img, create_time, update_time from act_config
+    </sql>
+
+    <select id="selectActConfigList" parameterType="ActConfig" resultMap="ActConfigResult">
+        <include refid="selectActConfigVo"/>
+        <where>  
+            <if test="pageStyle != null "> and page_style = #{pageStyle}</if>
+            <if test="actType != null "> and act_type = #{actType}</if>
+            <if test="actCode != null  and actCode != ''"> and act_code = #{actCode}</if>
+            <if test="actName != null  and actName != ''"> and act_name like concat('%', #{actName}, '%')</if>
+            <if test="shareTitle != null  and shareTitle != ''"> and share_title = #{shareTitle}</if>
+            <if test="shareDesc != null  and shareDesc != ''"> and share_desc = #{shareDesc}</if>
+            <if test="shareLink != null  and shareLink != ''"> and share_link = #{shareLink}</if>
+            <if test="shareImg != null  and shareImg != ''"> and share_img = #{shareImg}</if>
+        </where>
+    </select>
+    
+    <select id="selectActConfigById" parameterType="Integer" resultMap="ActConfigResult">
+        <include refid="selectActConfigVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertActConfig" parameterType="ActConfig" useGeneratedKeys="true" keyProperty="id">
+        insert into act_config
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="pageStyle != null">page_style,</if>
+            <if test="actType != null">act_type,</if>
+            <if test="actCode != null and actCode != ''">act_code,</if>
+            <if test="actName != null">act_name,</if>
+            <if test="shareTitle != null">share_title,</if>
+            <if test="shareDesc != null">share_desc,</if>
+            <if test="shareLink != null">share_link,</if>
+            <if test="shareImg != null">share_img,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="pageStyle != null">#{pageStyle},</if>
+            <if test="actType != null">#{actType},</if>
+            <if test="actCode != null and actCode != ''">#{actCode},</if>
+            <if test="actName != null">#{actName},</if>
+            <if test="shareTitle != null">#{shareTitle},</if>
+            <if test="shareDesc != null">#{shareDesc},</if>
+            <if test="shareLink != null">#{shareLink},</if>
+            <if test="shareImg != null">#{shareImg},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateActConfig" parameterType="ActConfig">
+        update act_config
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="pageStyle != null">page_style = #{pageStyle},</if>
+            <if test="actType != null">act_type = #{actType},</if>
+            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
+            <if test="actName != null">act_name = #{actName},</if>
+            <if test="shareTitle != null">share_title = #{shareTitle},</if>
+            <if test="shareDesc != null">share_desc = #{shareDesc},</if>
+            <if test="shareLink != null">share_link = #{shareLink},</if>
+            <if test="shareImg != null">share_img = #{shareImg},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteActConfigById" parameterType="Integer">
+        delete from act_config where id = #{id}
+    </delete>
+
+    <delete id="deleteActConfigByIds" parameterType="String">
+        delete from act_config where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml
index e15bdb05f..87a21a128 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml
@@ -12,12 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bgImg"    column="bg_img"    />
         <result property="btnText"    column="btn_text"    />
         <result property="btnLink"    column="btn_link"    />
+        <result property="btnLink2"    column="btn_link2"    />
+        <result property="btnText2"    column="btn_text2"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectActPageConfigGuideVo">
-        select id, act_code, act_title, act_desc, bg_img, btn_text, btn_link, create_time, update_time from act_page_config_guide
+        select id, act_code, act_title, act_desc, bg_img, btn_text, btn_link, btn_link2, btn_text2, create_time, update_time from act_page_config_guide
     </sql>
 
     <select id="selectActPageConfigGuideList" parameterType="ActPageConfigGuide" resultMap="ActPageConfigGuideResult">
@@ -29,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bgImg != null  and bgImg != ''"> and bg_img = #{bgImg}</if>
             <if test="btnText != null  and btnText != ''"> and btn_text = #{btnText}</if>
             <if test="btnLink != null  and btnLink != ''"> and btn_link = #{btnLink}</if>
+            <if test="btnLink2 != null  and btnLink2 != ''"> and btn_link2 = #{btnLink2}</if>
+            <if test="btnText2 != null  and btnText2 != ''"> and btn_text2 = #{btnText2}</if>
         </where>
     </select>
     
@@ -46,6 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bgImg != null">bg_img,</if>
             <if test="btnText != null">btn_text,</if>
             <if test="btnLink != null">btn_link,</if>
+            <if test="btnLink2 != null">btn_link2,</if>
+            <if test="btnText2 != null">btn_text2,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
          </trim>
@@ -56,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bgImg != null">#{bgImg},</if>
             <if test="btnText != null">#{btnText},</if>
             <if test="btnLink != null">#{btnLink},</if>
+            <if test="btnLink2 != null">#{btnLink2},</if>
+            <if test="btnText2 != null">#{btnText2},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
          </trim>
@@ -70,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bgImg != null">bg_img = #{bgImg},</if>
             <if test="btnText != null">btn_text = #{btnText},</if>
             <if test="btnLink != null">btn_link = #{btnLink},</if>
+            <if test="btnLink2 != null">btn_link2 = #{btnLink2},</if>
+            <if test="btnText2 != null">btn_text2 = #{btnText2},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml
new file mode 100644
index 000000000..d49db90be
--- /dev/null
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sinosoft.activity.mapper.ActPageConfigSubscribeMapper">
+    
+    <resultMap type="ActPageConfigSubscribe" id="ActPageConfigSubscribeResult">
+        <result property="id"    column="id"    />
+        <result property="actCode"    column="act_code"    />
+        <result property="description"    column="description"    />
+        <result property="bgImg"    column="bg_img"    />
+        <result property="bgImg2"    column="bg_img2"    />
+        <result property="qrCode"    column="qr_code"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectActPageConfigSubscribeVo">
+        select id, act_code, description, bg_img, bg_img2, qr_code, create_time, update_time from act_page_config_subscribe
+    </sql>
+
+    <select id="selectActPageConfigSubscribeList" parameterType="ActPageConfigSubscribe" resultMap="ActPageConfigSubscribeResult">
+        <include refid="selectActPageConfigSubscribeVo"/>
+        <where>  
+            <if test="actCode != null  and actCode != ''"> and act_code = #{actCode}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="bgImg != null  and bgImg != ''"> and bg_img = #{bgImg}</if>
+            <if test="bgImg2 != null  and bgImg2 != ''"> and bg_img2 = #{bgImg2}</if>
+            <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
+        </where>
+    </select>
+    
+    <select id="selectActPageConfigSubscribeById" parameterType="Integer" resultMap="ActPageConfigSubscribeResult">
+        <include refid="selectActPageConfigSubscribeVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertActPageConfigSubscribe" parameterType="ActPageConfigSubscribe" useGeneratedKeys="true" keyProperty="id">
+        insert into act_page_config_subscribe
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="actCode != null and actCode != ''">act_code,</if>
+            <if test="description != null">description,</if>
+            <if test="bgImg != null">bg_img,</if>
+            <if test="bgImg2 != null">bg_img2,</if>
+            <if test="qrCode != null">qr_code,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="actCode != null and actCode != ''">#{actCode},</if>
+            <if test="description != null">#{description},</if>
+            <if test="bgImg != null">#{bgImg},</if>
+            <if test="bgImg2 != null">#{bgImg2},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateActPageConfigSubscribe" parameterType="ActPageConfigSubscribe">
+        update act_page_config_subscribe
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
+            <if test="description != null">description = #{description},</if>
+            <if test="bgImg != null">bg_img = #{bgImg},</if>
+            <if test="bgImg2 != null">bg_img2 = #{bgImg2},</if>
+            <if test="qrCode != null">qr_code = #{qrCode},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteActPageConfigSubscribeById" parameterType="Integer">
+        delete from act_page_config_subscribe where id = #{id}
+    </delete>
+
+    <delete id="deleteActPageConfigSubscribeByIds" parameterType="String">
+        delete from act_page_config_subscribe where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
new file mode 100644
index 000000000..896623315
--- /dev/null
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sinosoft.activity.mapper.ActPageConfigUserinfoMapper">
+    
+    <resultMap type="ActPageConfigUserinfo" id="ActPageConfigUserinfoResult">
+        <result property="id"    column="id"    />
+        <result property="actCode"    column="act_code"    />
+        <result property="title"    column="title"    />
+        <result property="description"    column="description"    />
+        <result property="bgImg"    column="bg_img"    />
+        <result property="btnText"    column="btn_text"    />
+        <result property="btnLink"    column="btn_link"    />
+        <result property="agreement"    column="agreement"    />
+        <result property="userName"    column="user_name"    />
+        <result property="mobile"    column="mobile"    />
+        <result property="gender"    column="gender"    />
+        <result property="address"    column="address"    />
+        <result property="agentName"    column="agent_name"    />
+        <result property="agentMobile"    column="agent_mobile"    />
+        <result property="agentGender"    column="agent_gender"    />
+        <result property="agentNo"    column="agent_no"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectActPageConfigUserinfoVo">
+        select id, act_code, title, description, bg_img, btn_text, btn_link, agreement, user_name, mobile, gender, address, agent_name, agent_mobile, agent_gender, agent_no, create_time, update_time from act_page_config_userinfo
+    </sql>
+
+    <select id="selectActPageConfigUserinfoList" parameterType="ActPageConfigUserinfo" resultMap="ActPageConfigUserinfoResult">
+        <include refid="selectActPageConfigUserinfoVo"/>
+        <where>  
+            <if test="actCode != null  and actCode != ''"> and act_code = #{actCode}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="bgImg != null  and bgImg != ''"> and bg_img = #{bgImg}</if>
+            <if test="btnText != null  and btnText != ''"> and btn_text = #{btnText}</if>
+            <if test="btnLink != null  and btnLink != ''"> and btn_link = #{btnLink}</if>
+            <if test="agreement != null  and agreement != ''"> and agreement = #{agreement}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
+            <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="agentName != null  and agentName != ''"> and agent_name like concat('%', #{agentName}, '%')</if>
+            <if test="agentMobile != null  and agentMobile != ''"> and agent_mobile = #{agentMobile}</if>
+            <if test="agentGender != null  and agentGender != ''"> and agent_gender = #{agentGender}</if>
+            <if test="agentNo != null  and agentNo != ''"> and agent_no = #{agentNo}</if>
+        </where>
+    </select>
+    
+    <select id="selectActPageConfigUserinfoById" parameterType="Integer" resultMap="ActPageConfigUserinfoResult">
+        <include refid="selectActPageConfigUserinfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertActPageConfigUserinfo" parameterType="ActPageConfigUserinfo" useGeneratedKeys="true" keyProperty="id">
+        insert into act_page_config_userinfo
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="actCode != null and actCode != ''">act_code,</if>
+            <if test="title != null">title,</if>
+            <if test="description != null">description,</if>
+            <if test="bgImg != null">bg_img,</if>
+            <if test="btnText != null">btn_text,</if>
+            <if test="btnLink != null">btn_link,</if>
+            <if test="agreement != null">agreement,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="mobile != null">mobile,</if>
+            <if test="gender != null">gender,</if>
+            <if test="address != null">address,</if>
+            <if test="agentName != null">agent_name,</if>
+            <if test="agentMobile != null">agent_mobile,</if>
+            <if test="agentGender != null">agent_gender,</if>
+            <if test="agentNo != null">agent_no,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="actCode != null and actCode != ''">#{actCode},</if>
+            <if test="title != null">#{title},</if>
+            <if test="description != null">#{description},</if>
+            <if test="bgImg != null">#{bgImg},</if>
+            <if test="btnText != null">#{btnText},</if>
+            <if test="btnLink != null">#{btnLink},</if>
+            <if test="agreement != null">#{agreement},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="mobile != null">#{mobile},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="address != null">#{address},</if>
+            <if test="agentName != null">#{agentName},</if>
+            <if test="agentMobile != null">#{agentMobile},</if>
+            <if test="agentGender != null">#{agentGender},</if>
+            <if test="agentNo != null">#{agentNo},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateActPageConfigUserinfo" parameterType="ActPageConfigUserinfo">
+        update act_page_config_userinfo
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="description != null">description = #{description},</if>
+            <if test="bgImg != null">bg_img = #{bgImg},</if>
+            <if test="btnText != null">btn_text = #{btnText},</if>
+            <if test="btnLink != null">btn_link = #{btnLink},</if>
+            <if test="agreement != null">agreement = #{agreement},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="mobile != null">mobile = #{mobile},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="agentName != null">agent_name = #{agentName},</if>
+            <if test="agentMobile != null">agent_mobile = #{agentMobile},</if>
+            <if test="agentGender != null">agent_gender = #{agentGender},</if>
+            <if test="agentNo != null">agent_no = #{agentNo},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteActPageConfigUserinfoById" parameterType="Integer">
+        delete from act_page_config_userinfo where id = #{id}
+    </delete>
+
+    <delete id="deleteActPageConfigUserinfoByIds" parameterType="String">
+        delete from act_page_config_userinfo where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file