From 8b23ee9ff3c5087213adb0edb24101c043a042e9 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Thu, 8 Apr 2021 11:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/ActPageConfigSubscribe.java        | 20 +++----
 .../domain/ActPageConfigUserinfo.java         | 60 +++++++++----------
 .../templates/activity/info/add.html          | 28 ++++-----
 3 files changed, 54 insertions(+), 54 deletions(-)

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 31629a035..717976d00 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
@@ -18,24 +18,24 @@ public class ActPageConfigSubscribe extends BaseEntity
     /**  */
     private Integer id;
 
-    /**  */
-    @Excel(name = "")
+    /**活动代码  */
+    @Excel(name = "活动代码")
     private String actCode;
 
-    /**  */
-    @Excel(name = "")
+    /**描述  */
+    @Excel(name = "描述")
     private String description;
 
-    /**  */
-    @Excel(name = "")
+    /**背景图片  */
+    @Excel(name = "背景图片")
     private String bgImg;
 
-    /**  */
-    @Excel(name = "")
+    /** 二维码图片 */
+    @Excel(name = "二维码图片")
     private String bgImg2;
 
-    /**  */
-    @Excel(name = "")
+    /** 关注二维码描述 */
+    @Excel(name = "关注二维码描述")
     private String qrCode;
 
     public void setId(Integer id) 
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
index e2ba8c18a..8d6476e41 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java
@@ -18,64 +18,64 @@ public class ActPageConfigUserinfo extends BaseEntity
     /**  */
     private Integer id;
 
-    /**  */
-    @Excel(name = "")
+    /** 活动代码 */
+    @Excel(name = "活动代码")
     private String actCode;
 
-    /**  */
-    @Excel(name = "")
+    /**标题  */
+    @Excel(name = "标题")
     private String title;
 
-    /**  */
-    @Excel(name = "")
+    /**描述  */
+    @Excel(name = "描述")
     private String description;
 
-    /**  */
-    @Excel(name = "")
+    /**图片  */
+    @Excel(name = "图片")
     private String bgImg;
 
-    /**  */
-    @Excel(name = "")
+    /**按钮  */
+    @Excel(name = "按钮")
     private String btnText;
 
-    /**  */
-    @Excel(name = "")
+    /**按钮连接  */
+    @Excel(name = "按钮连接")
     private String btnLink;
 
-    /**  */
-    @Excel(name = "")
+    /**协议内容  */
+    @Excel(name = "协议内容")
     private String agreement;
 
-    /**  */
-    @Excel(name = "")
+    /**姓名  */
+    @Excel(name = "姓名")
     private String userName;
 
-    /**  */
-    @Excel(name = "")
+    /**手机号  */
+    @Excel(name = "手机号")
     private String mobile;
 
-    /**  */
-    @Excel(name = "")
+    /** 性别 */
+    @Excel(name = "性别")
     private String gender;
 
-    /**  */
-    @Excel(name = "")
+    /**地址  */
+    @Excel(name = "地址")
     private String address;
 
-    /**  */
-    @Excel(name = "")
+    /**代理人姓名 */
+    @Excel(name = "代理人姓名")
     private String agentName;
 
-    /**  */
-    @Excel(name = "")
+    /**代理人手机号  */
+    @Excel(name = "代理人手机号")
     private String agentMobile;
 
-    /**  */
-    @Excel(name = "")
+    /**代理人性别  */
+    @Excel(name = "代理人性别")
     private String agentGender;
 
-    /**  */
-    @Excel(name = "")
+    /** 代理人工号 */
+    @Excel(name = "代理人工号")
     private String agentNo;
 
     public void setId(Integer id) 
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 d180e6105..fe92b4101 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -562,7 +562,7 @@
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label is-required">描述：</label>
                                             <div class="col-sm-8">
-                                                <input id="describe" name="describe" placeholder="例如：客户手机号" class="form-control" type="text"
+                                                <input id="describe" name="description" placeholder="例如：客户手机号" class="form-control" type="text"
                                                        maxlength="30" onkeyup="updatePri(this)">
                                             </div>
                                         </div>
@@ -589,7 +589,7 @@
                                             <div>
                                                 <span class="btn btn-white btn-file"><span
                                                         class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="picture"></span>
+                                                    <input type="file" id="picture" name="bgImg"></span>
                                                 <a href="#" class="btn btn-white fileinput-exists"
                                                    data-dismiss="fileinput">清除</a>
                                             </div>
@@ -600,9 +600,9 @@
                                 <div class="row">
                                     <div class="col-sm-6">
                                         <div class="form-group">
-                                            <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
+                                            <label class="col-sm-4 control-label is-required">自定义按钮：</label>
                                             <div class="col-sm-8">
-                                                <input id="btn" name="btn" placeholder="自定义按钮" class="form-control" type="text"
+                                                <input id="btn" name="btnText" placeholder="自定义按钮" class="form-control" type="text"
                                                        maxlength="30" onkeyup="updatePri(this)">
                                             </div>
                                         </div>
@@ -625,13 +625,13 @@
                                             <label class="col-sm-4 control-label is-required">客户必填信息：</label>
                                             <div class="col-sm-8">
                                                 <label class="checkbox-inline">
-                                                    <input type="checkbox" name="name"   id="name" onclick="updateText(this)">姓名</input>
+                                                    <input type="checkbox" name="userName"   id="name" onclick="updateText(this)">姓名</input>
                                                 </label>
                                                 <label class="checkbox-inline">
                                                     <input type="checkbox" name="phone"   id="phone" onclick="updateText(this)">手机号</input>
                                                 </label>
                                                 <label class="checkbox-inline">
-                                                    <input type="checkbox" name="sex"  id="sex"  onclick="updateText(this)">性别</input>
+                                                    <input type="checkbox" name="gender"  id="sex"  onclick="updateText(this)">性别</input>
                                                 </label>
                                                 <label class="checkbox-inline">
                                                     <input type="checkbox" name="address" id="address"   onclick="updateText(this)">地址</input>
@@ -649,13 +649,13 @@
                                                     <input type="checkbox" name="agentName"   id="agentName" onclick="updateText(this)">代理人姓名</input>
                                                 </label>
                                                 <label class="checkbox-inline">
-                                                    <input type="checkbox" name="agentPhone"   id="agentPhone" onclick="updateText(this)">代理人手机号</input>
+                                                    <input type="checkbox" name="agentMobile"   id="agentPhone" onclick="updateText(this)">代理人手机号</input>
                                                 </label>
                                                 <label class="checkbox-inline">
-                                                    <input type="checkbox" name="agentSex"  id="agentSex"  onclick="updateText(this)">代理人性别</input>
+                                                    <input type="checkbox" name="agentGender"  id="agentSex"  onclick="updateText(this)">代理人性别</input>
                                                 </label>
                                                 <label class="checkbox-inline">
-                                                    <input type="checkbox" name="agentNumber" id="agentNumber"   onclick="updateText(this)">代理人工号</input>
+                                                    <input type="checkbox" name="agentNo" id="agentNumber"   onclick="updateText(this)">代理人工号</input>
                                                 </label>
                                             </div>
                                         </div>
@@ -722,7 +722,7 @@
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label is-required">分享连接：</label>
                                             <div class="col-sm-8">
-                                                <input id="shareConnect" name="shareConnect" placeholder="例如：http://XX" class="form-control" type="text"
+                                                <input id="shareConnect" name="shareLink" placeholder="例如：http://XX" class="form-control" type="text"
                                                        maxlength="30" onkeyup="updatePri(this)">
                                             </div>
                                         </div>
@@ -744,7 +744,7 @@
                                         <div class="form-group">
                                             <label class="col-sm-4 control-label is-required">分享描述：</label>
                                             <div class="col-sm-8">
-                                                <input id="shareDescribe" name="shareDescribe" placeholder="例如：参与活动，赢大奖" class="form-control" type="text"
+                                                <input id="shareDescribe" name="shareDesc" placeholder="例如：参与活动，赢大奖" class="form-control" type="text"
                                                        maxlength="30" onkeyup="updatePri(this)">
                                             </div>
                                         </div>
@@ -760,7 +760,7 @@
                                             <div>
                                                 <span class="btn btn-white btn-file"><span
                                                         class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="shareImg"></span>
+                                                    <input type="file" id="shareImg" name="shareImg"></span>
                                                 <a href="#" class="btn btn-white fileinput-exists"
                                                    data-dismiss="fileinput">清除</a>
                                             </div>
@@ -814,7 +814,7 @@
                                             <div>
                                                 <span class="btn btn-white btn-file"><span
                                                         class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="backdropImg"></span>
+                                                    <input type="file" id="backdropImg" name="bgImg"></span>
                                                 <a href="#" class="btn btn-white fileinput-exists"
                                                    data-dismiss="fileinput">清除</a>
                                             </div>
@@ -831,7 +831,7 @@
                                             <div>
                                                 <span class="btn btn-white btn-file"><span
                                                         class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="qrCodeImg"></span>
+                                                    <input type="file" id="qrCodeImg" name="bgImg2"></span>
                                                 <a href="#" class="btn btn-white fileinput-exists"
                                                    data-dismiss="fileinput">清除</a>
                                             </div>