diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 9de3eba0a..5e62e755c 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -510,6 +510,36 @@ var table = {
                 });
                 return actions.join('');
             },
+            // 回显活动名称
+            selectDrawname: function(datas, value) {
+                if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
+                    return '';
+                }
+                var actions = [];
+                $.each(datas, function(index, draw) {
+                    if (draw.drawcode == ('' + value)) {
+                        var listClass = $.common.equals("default", draw.listClass) || $.common.isEmpty(draw.listClass) ? "" : "badge badge-" + draw.listClass;
+                        actions.push($.common.sprintf("<span class='%s'>%s</span>", listClass, draw.drawname));
+                        return false;
+                    }
+                });
+                return actions.join('');
+            },
+            // 回显奖品名称
+            selectprivename: function(datas, value) {
+                if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
+                    return '';
+                }
+                var actions = [];
+                $.each(datas, function(index, draw) {
+                    if (draw.prizecode == ('' + value)) {
+                        var listClass = $.common.equals("default", draw.listClass) || $.common.isEmpty(draw.listClass) ? "" : "badge badge-" + draw.listClass;
+                        actions.push($.common.sprintf("<span class='%s'>%s</span>", listClass, draw.prizename));
+                        return false;
+                    }
+                });
+                return actions.join('');
+            },
             // 回显数据字典（字符串数组）
             selectDictLabels: function(datas, value, separator) {
             	if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
index 3962dd31a..a8cecb22d 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawInfoMapper.java
@@ -29,6 +29,8 @@ public interface DrawInfoMapper
      */
     public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo);
 
+    List<DrawInfo> findDrawInfoList();
+
     /**
      * 新增抽奖活动管理对象
      * 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java
index b0f16ce55..567c6b0a1 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawPrizeInfoMapper.java
@@ -33,6 +33,8 @@ public interface DrawPrizeInfoMapper
      */
     public List<DrawPrizeInfo> selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo);
 
+    List<DrawPrizeInfo> findDrawPrizeInfoList();
+
     /**
      * 新增存储奖品的基础信息
      * 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
index 29ea2bf75..1435171f3 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
@@ -29,6 +29,12 @@ public interface IDrawInfoService
      */
     public List<DrawInfo> selectDrawInfoList(DrawInfo drawInfo);
 
+    /**
+     * 查询活动列表-下拉用
+     * @return
+     */
+    public List<DrawInfo> findDrawInfoList();
+
     /**
      * 新增抽奖活动管理对象
      * 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java
index 9de3daee9..81be02b7d 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawPrizeInfoService.java
@@ -27,6 +27,12 @@ public interface IDrawPrizeInfoService
      */
     public List<DrawPrizeInfo> selectDrawPrizeInfoList(DrawPrizeInfo drawPrizeInfo);
 
+    /**
+     * 奖品列表-下拉框
+     * @return
+     */
+    List<DrawPrizeInfo> findDrawPrizeInfoList();
+
     /**
      * 新增存储奖品的基础信息
      * 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
index 8a2c2a4a8..948480cc0 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
@@ -16,7 +16,7 @@ import com.ruoyi.common.core.text.Convert;
  * @author xlh
  * @date 2021-03-25
  */
-@Service
+@Service("drawInfo")
 public class DrawInfoServiceImpl implements IDrawInfoService
 {
     @Autowired
@@ -46,6 +46,11 @@ public class DrawInfoServiceImpl implements IDrawInfoService
         return drawInfoMapper.selectDrawInfoList(drawInfo);
     }
 
+    @Override
+    public List<DrawInfo> findDrawInfoList() {
+        return drawInfoMapper.findDrawInfoList();
+    }
+
     /**
      * 新增抽奖活动管理对象
      * 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java
index 70831ff96..d30523a76 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawPrizeInfoServiceImpl.java
@@ -15,7 +15,7 @@ import com.ruoyi.common.core.text.Convert;
  * @author dy
  * @date 2021-03-25
  */
-@Service
+@Service("drawPrize")
 public class DrawPrizeInfoServiceImpl implements IDrawPrizeInfoService 
 {
     @Autowired
@@ -45,6 +45,11 @@ public class DrawPrizeInfoServiceImpl implements IDrawPrizeInfoService
         return drawPrizeInfoMapper.selectDrawPrizeInfoList(drawPrizeInfo);
     }
 
+    @Override
+    public List<DrawPrizeInfo> findDrawPrizeInfoList() {
+        return drawPrizeInfoMapper.findDrawPrizeInfoList();
+    }
+
     /**
      * 新增存储奖品的基础信息
      * 
diff --git a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
index d67c7da8f..126ce3df1 100644
--- a/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/DrawInfoMapper.xml
@@ -56,6 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="VALIDATETYPE != null  and VALIDATETYPE != ''"> and VALIDATETYPE = #{VALIDATETYPE}</if>
         </where>
     </select>
+
+    <select id="findDrawInfoList"  resultMap="DrawInfoResult">
+        select DRAWID, DRAWCODE, DRAWTYPE, DRAWNAME from draw_info
+    </select>
     
     <select id="selectDrawInfoById" parameterType="String" resultMap="DrawInfoResult">
 SELECT
diff --git a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml
index 76ba67042..b9127e000 100644
--- a/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/DrawPrizeInfoMapper.xml
@@ -35,6 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="INTEGRALPROJECTCODE != null  and INTEGRALPROJECTCODE != ''"> and INTEGRALPROJECTCODE = #{INTEGRALPROJECTCODE}</if>
         </where>
     </select>
+
+    <select id="findDrawPrizeInfoList"  resultMap="DrawPrizeInfoResult">
+        <include refid="selectDrawPrizeInfoVo"/>
+    </select>
     
     <select id="selectDrawPrizeInfoById" parameterType="java.lang.String" resultMap="DrawPrizeInfoResult">
         <include refid="selectDrawPrizeInfoVo"/>
diff --git a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
index 46a7cf3c1..71cd8efb1 100644
--- a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
+++ b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
@@ -1,150 +1,167 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('活动次数记录信息列表')" />
+    <th:block th:include="include :: header('活动次数记录信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>活动代码：</label>
-                                <input type="text" name="DRAWCODE"/>
-                            </li>
-                            <li>
-                                <label>任务流水：</label>
-                                <input type="text" name="TASKID"/>
-                            </li>
-                            <li>
-                                <label>次数类型：</label>
-                                <select name="TYPE" th:with="type=${@dict.getType('drawType')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>赠送次数：</label>-->
-<!--                                <input type="text" name="ADDNUMBER"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>状态：</label>
-                                <select name="STATE" th:with="type=${@dict.getType('status')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>可用次数：</label>-->
-<!--                                <input type="text" name="AVAILABLENUMBER"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>手机号：</label>
-                                <input type="text" name="PHONE"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>身份认证状态：</label>-->
-<!--                                <input type="text" name="VSTATE"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>用户等级：</label>
-                                <input type="text" name="ULEVEL"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>请求来源：</label>-->
-<!--                                <input type="text" name="SOURCE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>是否白名单：</label>-->
-<!--                                <input type="text" name="ISSPECIALFLAG"/>-->
-<!--                            </li>-->
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>活动名称：</label>
+                            <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
+                                <option value="">所有</option>
+                                <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
+                                        th:value="${drawInfo.DRAWCODE}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>任务流水：</label>
+                            <input type="text" name="TASKID"/>
+                        </li>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:DrawTaskNotify:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:DrawTaskNotify:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:DrawTaskNotify:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:DrawTaskNotify:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+                                                    <li>
+                                                        <label>用户标识：</label>
+                                                        <input type="text" name="USERID"/>
+                                                    </li>
+                        <!--                            <li>-->
+                        <!--                                <label>手机号：</label>-->
+                        <!--                                <input type="text" name="PHONE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>身份认证状态：</label>-->
+                        <!--                                <input type="text" name="VSTATE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>用户等级：</label>-->
+                        <!--                                <input type="text" name="ULEVEL"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>次数类型：</label>-->
+                        <!--                                <select name="TYPE" th:with="type=${@dict.getType('drawType')}" style="width: 80px">-->
+                        <!--                                    <option value="">所有</option>-->
+                        <!--                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
+                        <!--                                </select>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>赠送次数：</label>-->
+                        <!--                                <input type="text" name="ADDNUMBER"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>状态：</label>
+                            <select name="STATE" th:with="type=${@dict.getType('status')}" style="width: 80px">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>请求来源：</label>-->
+                        <!--                                <input type="text" name="SOURCE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>是否白名单：</label>-->
+                        <!--                                <input type="text" name="ISSPECIALFLAG"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:DrawTaskNotify:add">-->
+            <!--                    <i class="fa fa-plus"></i> 添加-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:DrawTaskNotify:edit">-->
+            <!--                    <i class="fa fa-edit"></i> 修改-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:DrawTaskNotify:remove">-->
+            <!--                    <i class="fa fa-remove"></i> 删除-->
+            <!--                </a>-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()"
+               shiro:hasPermission="activity:DrawTaskNotify:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('activity:DrawTaskNotify:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('activity:DrawTaskNotify:remove')}]];
-        var STATEDatas = [[${@dict.getType('status')}]];
-        var prefix = ctx + "activity/DrawTaskNotify";
-        var drawTypes = [[${@dict.getType('drawType')}]];
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('activity:DrawTaskNotify:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('activity:DrawTaskNotify:remove')}]];
+    var STATEDatas = [[${@dict.getType('status')}]];
+    var prefix = ctx + "activity/DrawTaskNotify";
+    var drawTypes = [[${@dict.getType('drawType')}]];
+    var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "活动次数记录信息",
-                columns: [{
-                    checkbox: true
-                },
-                // {
-                //     field: 'tasknotifyid',
-                //     title: '业务主键'
-                // },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "活动次数记录信息",
+            columns: [{
+                checkbox: true
+            },
                 {
-                    field: 'drawcode',
-                    title: '活动代码'
-                },
-                {
-                    field: 'taskid',
-                    title: '任务流水'
-                },
-                {
-                    field: 'userid',
-                    title: '用户标识',
+                    field: 'tasknotifyid',
+                    title: '业务主键',
                     visible: false
                 },
                 {
-                    field: 'type',
-                    title: '赠送次数类型',
-                    formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(drawTypes, value);
+                    field: 'userid',
+                    title: '用户标识'
+                },
+                {
+                    field: 'drawcode',
+                    title: '活动名称',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDrawname(drawInfoList, value);
                     }
                 },
                 {
                     field: 'addnumber',
                     title: '赠送次数'
                 },
+                {
+                    field: 'availablenumber',
+                    title: '可用次数'
+                },
                 {
                     field: 'state',
                     title: '状态',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(STATEDatas, value);
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(STATEDatas, value);
                     }
                 },
                 {
-                    field: 'availablenumber',
-                    title: '可用次数'
+                    field: 'type',
+                    title: '赠送次数类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(drawTypes, value);
+                    }
+                },
+                {
+                    field: 'taskid',
+                    title: '任务流水'
+                },
+                {
+                    field: 'tasktype',
+                    title: '请求类型'
                 },
                 {
                     field: 'checkingdate',
@@ -153,28 +170,29 @@
                 },
                 {
                     field: 'phone',
-                    title: '手机号'
+                    title: '手机号',
+                    visible: false
                 },
+
                 {
-                    field: 'tasktype',
-                    title: '请求类型',
+                    field: 'vstate',
+                    title: '身份认证状态',
                     visible: false
                 },
-                {
-                    field: 'vstate',
-                    title: '身份认证状态'
-                },
                 {
                     field: 'ulevel',
-                    title: '用户等级'
+                    title: '用户等级',
+                    visible: false
                 },
                 {
                     field: 'source',
-                    title: '请求来源'
+                    title: '请求来源',
+                    visible: false
                 },
                 {
                     field: 'isspecialflag',
-                    title: '是否白名单'
+                    title: '是否白名单',
+                    visible: false
                 },
                 {
                     field: 'requestflag',
@@ -191,10 +209,10 @@
                 //         return actions.join('');
                 //     }
                 // }
-                ]
-            };
-            $.table.init(options);
-        });
-    </script>
+            ]
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/add.html b/sino-activity/src/main/resources/templates/activity/awardRecord/add.html
index fd8b563db..7296a9083 100644
--- a/sino-activity/src/main/resources/templates/activity/awardRecord/add.html
+++ b/sino-activity/src/main/resources/templates/activity/awardRecord/add.html
@@ -14,7 +14,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">奖品代码：</label>
+                <label class="col-sm-3 control-label">奖品名称：</label>
                 <div class="col-sm-8">
                     <input name="PRIZECODE" class="form-control" type="text">
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html b/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html
index f3e0dbd64..469875523 100644
--- a/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/awardRecord/edit.html
@@ -15,7 +15,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">奖品代码：</label>
+                <label class="col-sm-3 control-label">奖品名称：</label>
                 <div class="col-sm-8">
                     <input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text">
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html
index e4bdfd4d0..4c3bdbe5a 100644
--- a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html
+++ b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html
@@ -1,185 +1,212 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('记录发奖信息列表')" />
+    <th:block th:include="include :: header('记录发奖信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>活动代码：</label>
-                                <input type="text" name="DRAWCODE"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>奖品代码：</label>-->
-<!--                                <input type="text" name="PRIZECODE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>用户标识：</label>-->
-<!--                                <input type="text" name="USERID"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>抽奖记录标识：</label>-->
-<!--                                <input type="text" name="DRAWRECORDID"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>发奖时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择发奖时间" name="AWARDTIME"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>发奖结果：</label>-->
-<!--                                <input type="text" name="AWARDRESULT"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>错误码：</label>-->
-<!--                                <input type="text" name="RETURNCODE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>错误信息：</label>-->
-<!--                                <input type="text" name="RETURNMESSAGE"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>手机号：</label>
-                                <input type="text" name="PHONE"/>
-                            </li>
-                            <li>
-                                <label>用户名：</label>
-                                <input type="text" name="USERNAME"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>抽奖流水：</label>-->
-<!--                                <input type="text" name="DRAWTRANSEQNO"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>发奖流水：</label>-->
-<!--                                <input type="text" name="AWARDTRANSEQNO"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>奖品等级：</label>
-                                <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>奖品类型：</label>
-                                <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>商户号：</label>-->
-<!--                                <input type="text" name="MERCHANTCODE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>商户系统号：</label>-->
-<!--                                <input type="text" name="MERCHANTSYSCODE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>渠道：</label>-->
-<!--                                <input type="text" name="CHANNEL"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>业务领域：</label>-->
-<!--                                <input type="text" name="BUSINESSAREA"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>城市：</label>-->
-<!--                                <input type="text" name="CITY"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>扩展：</label>-->
-<!--                                <input type="text" name="EXTID"/>-->
-<!--                            </li>-->
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>活动名称：</label>
+                            <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
+                                <option value="">所有</option>
+                                <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
+                                        th:value="${drawInfo.DRAWCODE}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>奖品名称：</label>
+                            <select name="PRIZECODE" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
+                                <option value="">所有</option>
+                                <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                        th:value="${drawPrize.PRIZECODE}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>用户标识：</label>
+                            <input type="text" name="USERID"/>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>抽奖记录标识：</label>-->
+                        <!--                                <input type="text" name="DRAWRECORDID"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>发奖时间：</label>-->
+                        <!--                                <input type="text" class="time-input" placeholder="请选择发奖时间" name="AWARDTIME"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>发奖结果：</label>
+                            <select name="AWARDRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 80px">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>错误码：</label>-->
+                        <!--                                <input type="text" name="RETURNCODE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>错误信息：</label>-->
+                        <!--                                <input type="text" name="RETURNMESSAGE"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>手机号：</label>
+                            <input type="text" name="PHONE"/>
+                        </li>
+                        <li>
+                            <label>用户名：</label>
+                            <input type="text" name="USERNAME"/>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>抽奖流水：</label>-->
+                        <!--                                <input type="text" name="DRAWTRANSEQNO"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>发奖流水：</label>-->
+                        <!--                                <input type="text" name="AWARDTRANSEQNO"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>奖品等级：</label>
+                            <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}" style="width: 80px">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>奖品类型：</label>
+                            <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 80px">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>商户号：</label>-->
+                        <!--                                <input type="text" name="MERCHANTCODE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>商户系统号：</label>-->
+                        <!--                                <input type="text" name="MERCHANTSYSCODE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>渠道：</label>-->
+                        <!--                                <input type="text" name="CHANNEL"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>业务领域：</label>-->
+                        <!--                                <input type="text" name="BUSINESSAREA"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>城市：</label>-->
+                        <!--                                <input type="text" name="CITY"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>扩展：</label>-->
+                        <!--                                <input type="text" name="EXTID"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">-->
+            <!--                    <i class="fa fa-plus"></i> 添加-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">-->
+            <!--                    <i class="fa fa-edit"></i> 修改-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">-->
+            <!--                    <i class="fa fa-remove"></i> 删除-->
+            <!--                </a>-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
-        var prefix = ctx + "activity/award/record";
-        var datas = [[${@dict.getType('prizeLevel')}]];
-        var prizetypes = [[${@dict.getType('prizeType')}]];
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
+    var prefix = ctx + "activity/award/record";
+    var datas = [[${@dict.getType('prizeLevel')}]];
+    var prizetypes = [[${@dict.getType('prizeType')}]];
+    var drawResults = [[${@dict.getType('drawResult')}]];
+    var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
+    var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "记录发奖信息",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "记录发奖信息",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'awardrecordid',
                     title: '主键',
                     visible: false
                 },
-                {
-                    field: 'drawcode',
-                    title: '抽奖活动代码'
-                },
-                {
-                    field: 'prizecode',
-                    title: '奖品代码'
-                },
                 {
                     field: 'userid',
                     title: '用户标识'
                 },
                 {
-                    field: 'drawrecordid',
-                    title: '抽奖记录标识'
+                    field: 'username',
+                    title: '用户名'
+                },
+                {
+                    field: 'drawcode',
+                    title: '活动名称',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDrawname(drawInfoList, value);
+                    }
+                },
+                {
+                    field: 'prizecode',
+                    title: '奖品名称',
+                    formatter: function (value, row, index) {
+                        return $.table.selectprivename(drawPrizeList, value);
+                    }
+                },
+                {
+                    field: 'prizetype',
+                    title: '奖品类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(prizetypes, value);
+                    }
+                },
+                {
+                    field: 'awardresult',
+                    title: '发奖结果',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(drawResults, value);
+                    }
                 },
                 {
                     field: 'awardtime',
                     title: '发奖时间'
                 },
-                {
-                    field: 'awardresult',
-                    title: '发奖结果'
-                },
-                {
-                    field: 'returncode',
-                    title: '错误码'
-                },
-                {
-                    field: 'returnmessage',
-                    title: '错误信息'
-                },
                 {
                     field: 'phone',
                     title: '手机号'
@@ -189,9 +216,22 @@
                     title: '地址'
                 },
                 {
-                    field: 'username',
-                    title: '用户名'
+                    field: 'drawrecordid',
+                    title: '抽奖记录标识',
+                    visible: false
                 },
+                {
+                    field: 'returncode',
+                    title: '错误码',
+                    visible: false
+                },
+                {
+                    field: 'returnmessage',
+                    title: '错误信息',
+                    visible: false
+                },
+
+
                 // {
                 //     field: 'createtimestamp',
                 //     title: '创建时间'
@@ -202,50 +242,53 @@
                 // },
                 {
                     field: 'drawtranseqno',
-                    title: '抽奖流水'
+                    title: '抽奖流水',
+                    visible: false
                 },
                 {
                     field: 'awardtranseqno',
-                    title: '发奖流水'
+                    title: '发奖流水',
+                    visible: false
                 },
                 {
                     field: 'prizelevel',
                     title: '奖品等级',
-                    formatter: function(value, row, index) {
+                    visible: false,
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(datas, value);
                     }
                 },
+
                 {
-                    field: 'prizetype',
-                    title: '奖品类型',
-                    formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(prizetypes, value);
-                    }
+                    field: 'merchantcode',
+                    title: '商户号',
+                    visible: false
+                },
+                {
+                    field: 'merchantsyscode',
+                    title: '商户系统号',
+                    visible: false
+                },
+                {
+                    field: 'channel',
+                    title: '渠道',
+                    visible: false
+                },
+                {
+                    field: 'businessarea',
+                    title: '业务领域',
+                    visible: false
                 },
-                // {
-                //     field: 'merchantcode',
-                //     title: '商户号'
-                // },
-                // {
-                //     field: 'merchantsyscode',
-                //     title: '商户系统号'
-                // },
-                // {
-                //     field: 'channel',
-                //     title: '渠道'
-                // },
-                // {
-                //     field: 'businessarea',
-                //     title: '业务领域'
-                // },
                 {
                     field: 'city',
-                    title: '城市'
+                    title: '城市',
+                    visible: false
+                },
+                {
+                    field: 'extid',
+                    title: '扩展',
+                    visible: false
                 },
-                // {
-                //     field: 'extid',
-                //     title: '扩展'
-                // },
                 // {
                 //     title: '操作',
                 //     align: 'center',
@@ -256,10 +299,10 @@
                 //         return actions.join('');
                 //     }
                 // }
-                ]
-            };
-            $.table.init(options);
-        });
-    </script>
+            ]
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/consume/consume.html b/sino-activity/src/main/resources/templates/activity/consume/consume.html
index 352c7241e..94f8ecffc 100644
--- a/sino-activity/src/main/resources/templates/activity/consume/consume.html
+++ b/sino-activity/src/main/resources/templates/activity/consume/consume.html
@@ -1,100 +1,111 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('抽奖次数消费信息列表')" />
+    <th:block th:include="include :: header('抽奖次数消费信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>活动代码：</label>
-                                <input type="text" name="DRAWCODE"/>
-                            </li>
-                            <li>
-                                <label>任务流水：</label>
-                                <input type="text" name="TASKID"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>用户标识：</label>-->
-<!--                                <input type="text" name="USERID"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>次数类型：</label>
-                                <select name="TYPE" th:with="type=${@dict.getType('drawType')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>使用次数：</label>-->
-<!--                                <input type="text" name="CONSUMENUMBER"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>使用流水：</label>-->
-<!--                                <input type="text" name="TRANSEQNO"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>使用主键：</label>-->
-<!--                                <input type="text" name="TRADEORDERID"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>状态：</label>
-                                <select name="STATE" th:with="type=${@dict.getType('status')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>活动名称：</label>
+                            <!--                                <input type="text" name="DRAWCODE"/>-->
+                            <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
+                                <option value="">所有</option>
+                                <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
+                                        th:value="${drawInfo.DRAWCODE}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>任务流水：</label>
+                            <input type="text" name="TASKID"/>
+                        </li>
+                        <li>
+                            <label>用户标识：</label>
+                            <input type="text" name="USERID"/>
+                        </li>
+                        <li>
+                            <label>次数类型：</label>
+                            <select name="TYPE" th:with="type=${@dict.getType('drawType')}" style="width: 80px">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>使用次数：</label>-->
+                        <!--                                <input type="text" name="CONSUMENUMBER"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>使用流水：</label>-->
+                        <!--                                <input type="text" name="TRANSEQNO"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>使用主键：</label>-->
+                        <!--                                <input type="text" name="TRADEORDERID"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>状态：</label>
+                            <select name="STATE" th:with="type=${@dict.getType('status')}" style="width: 80px">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:consume:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:consume:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:consume:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:consume:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:consume:add">-->
+            <!--                    <i class="fa fa-plus"></i> 添加-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:consume:edit">-->
+            <!--                    <i class="fa fa-edit"></i> 修改-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:consume:remove">-->
+            <!--                    <i class="fa fa-remove"></i> 删除-->
+            <!--                </a>-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:consume:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('activity:consume:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('activity:consume:remove')}]];
-        var prefix = ctx + "activity/consume";
-        var drawTypes = [[${@dict.getType('drawType')}]];
-        var STATEDatas = [[${@dict.getType('status')}]];
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('activity:consume:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('activity:consume:remove')}]];
+    var prefix = ctx + "activity/consume";
+    var drawTypes = [[${@dict.getType('drawType')}]];
+    var STATEDatas = [[${@dict.getType('status')}]];
+    var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
+
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "抽奖次数消费信息",
+            columns: [{
+                checkbox: true
+            },
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "抽奖次数消费信息",
-                columns: [{
-                    checkbox: true
-                },
                 {
                     field: 'taskconsumeid',
                     title: '业务主键',
@@ -102,51 +113,56 @@
                 },
                 {
                     field: 'tasknotifyid',
-                    title: '活动次数记录主键'
-                },
-                {
-                    field: 'drawcode',
-                    title: '活动代码'
-                },
-                {
-                    field: 'taskid',
-                    title: '任务流水'
+                    title: '活动次数记录主键',
+                    visible: false
                 },
                 {
                     field: 'userid',
                     title: '用户标识'
                 },
+                {
+                    field: 'drawcode',
+                    title: '活动名称',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDrawname(drawInfoList, value);
+                    }
+                },
                 {
                     field: 'type',
                     title: '赠送次数类型',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(drawTypes, value);
                     }
                 },
+                {
+                    field: 'createtimestamp',
+                    title: '创建时间'
+                },
                 {
                     field: 'consumenumber',
                     title: '使用次数'
                 },
+                {
+                    field: 'taskid',
+                    title: '任务流水'
+                },
                 {
                     field: 'transeqno',
                     title: '使用流水'
                 },
                 {
                     field: 'tradeorderid',
-                    title: '使用主键'
+                    title: '使用主键',
+                    visible: false
                 },
                 {
                     field: 'state',
                     title: '状态',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(STATEDatas, value);
                     }
                 },
                 // {
-                //     field: 'createtimestamp',
-                //     title: '创建时间'
-                // },
-                // {
                 //     field: 'lastupdatetimestamp',
                 //     title: '最后修改时间'
                 // },
@@ -160,10 +176,10 @@
                 //         return actions.join('');
                 //     }
                 // }
-                ]
-            };
-            $.table.init(options);
-        });
-    </script>
+            ]
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
index 92ea7690b..30505eaa9 100644
--- a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
+++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
@@ -11,24 +11,24 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>奖品代码：</label>
+                                <label>奖品名称：</label>
                                 <input type="text" name="PRIZECODE"/>
                             </li>
                             <li>
                                 <label>奖品名称：</label>
                                 <input type="text" name="PRIZENAME"/>
                             </li>
+                            <li>
+                                <label>奖品面额：</label>
+                                <input type="text" name="PRIZEVALUE"/>
+                            </li>
                             <li>
                                 <label>奖品类型：</label>
-                                <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}">
+                                <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 100px">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
-                            <li>
-                                <label>奖品面额：</label>
-                                <input type="text" name="PRIZEVALUE"/>
-                            </li>
 <!--                            <li>-->
 <!--                                <label>创建时间：</label>-->
 <!--                                <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>-->
@@ -39,7 +39,7 @@
 <!--                            </li>-->
                             <li>
                                 <label>状态：</label>
-                                <select name="STATUS" th:with="type=${@dict.getType('status')}">
+                                <select name="STATUS" th:with="type=${@dict.getType('status')}" style="width: 80px">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
@@ -142,16 +142,17 @@
                     field: 'integralprojectcode',
                     title: '积分项目编码'
                 },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.prizeid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.prizeid + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
+                // {
+                //     title: '操作',
+                //     align: 'center',
+                //     formatter: function(value, row, index) {
+                //         var actions = [];
+                //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.prizeid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.prizeid + '\')"><i class="fa fa-remove"></i>删除</a>');
+                //         return actions.join('');
+                //     }
+                // }
+                ]
             };
             $.table.init(options);
         });
diff --git a/sino-activity/src/main/resources/templates/activity/record/add.html b/sino-activity/src/main/resources/templates/activity/record/add.html
index 987ea0b78..9481bc051 100644
--- a/sino-activity/src/main/resources/templates/activity/record/add.html
+++ b/sino-activity/src/main/resources/templates/activity/record/add.html
@@ -41,7 +41,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">奖品代码：</label>
+                <label class="col-sm-3 control-label">奖品名称：</label>
                 <div class="col-sm-8">
                     <input name="PRIZECODE" class="form-control" type="text">
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/record/edit.html b/sino-activity/src/main/resources/templates/activity/record/edit.html
index 336407fac..181e090e6 100644
--- a/sino-activity/src/main/resources/templates/activity/record/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/record/edit.html
@@ -42,7 +42,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">奖品代码：</label>
+                <label class="col-sm-3 control-label">奖品名称：</label>
                 <div class="col-sm-8">
                     <input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text">
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/record/record.html b/sino-activity/src/main/resources/templates/activity/record/record.html
index 4d3f1adbb..dacb7d2d0 100644
--- a/sino-activity/src/main/resources/templates/activity/record/record.html
+++ b/sino-activity/src/main/resources/templates/activity/record/record.html
@@ -1,171 +1,215 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('抽奖记录信息列表')" />
+    <th:block th:include="include :: header('抽奖记录信息列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>抽奖流水：</label>
-                                <input type="text" name="DRAWTRANSEQNO"/>
-                            </li>
-                            <li>
-                                <label>活动代码：</label>
-                                <input type="text" name="DRAWCODE"/>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>用户标识：</label>-->
-<!--                                <input type="text" name="USERID"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>抽奖时间：</label>-->
-<!--                                <input type="text" class="time-input" placeholder="请选择抽奖时间" name="DRAWTIME"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>抽奖结果：</label>
-                                <input type="text" name="DRAWRESULT"/>
-                            </li>
-                            <li>
-                                <label>奖品代码：</label>
-                                <input type="text" name="PRIZECODE"/>
-                            </li>
-                            <li>
-                                <label>奖品类型：</label>
-                                <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>账务日期：</label>-->
-<!--                                <input type="text" class="time-input" placeholder="请选择账务日期" name="CHECKINGDATE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>创建时间：</label>-->
-<!--                                <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>最后修改时间：</label>-->
-<!--                                <input type="text" class="time-input" placeholder="请选择最后修改时间" name="LASTUPDATETIMESTAMP"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>渠道：</label>-->
-<!--                                <input type="text" name="CHANNEL"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>用户名：</label>
-                                <input type="text" name="USERNAME"/>
-                            </li>
-                            <li>
-                                <label>奖品等级：</label>
-                                <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-<!--                            <li>-->
-<!--                                <label>奖品项目编码：</label>-->
-<!--                                <input type="text" name="PROJECTCODE"/>-->
-<!--                            </li>-->
-<!--                            <li>-->
-<!--                                <label>请求来源：</label>-->
-<!--                                <input type="text" name="SOURCE"/>-->
-<!--                            </li>-->
-                            <li>
-                                <label>手机号：</label>
-                                <input type="text" name="PHONE"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <!--                            <li>-->
+                        <!--                                <label>抽奖流水：</label>-->
+                        <!--                                <input type="text" name="DRAWTRANSEQNO"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>活动名称：</label>
+                            <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
+                                <option value="">所有</option>
+                                <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
+                                        th:value="${drawInfo.DRAWCODE}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>用户标识：</label>
+                            <input type="text" name="USERID"/>
+                        </li>
+                        <!--                            <li>-->
+                        <!--                                <label>抽奖时间：</label>-->
+                        <!--                                <input type="text" class="time-input" placeholder="请选择抽奖时间" name="DRAWTIME"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>抽奖结果：</label>
+                            <select name="DRAWRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 80px">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                        th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>奖品名称：</label>
+                            <select name="PRIZECODE" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
+                                <option value="">所有</option>
+                                <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                        th:value="${drawPrize.PRIZECODE}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>用户名：</label>
+                            <input type="text" name="USERNAME"/>
+                        </li>
+<!--                        <li>-->
+<!--                            <label>奖品类型：</label>-->
+<!--                            <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 100px">-->
+<!--                                <option value="">所有</option>-->
+<!--                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
+<!--                                        th:value="${dict.dictValue}"></option>-->
+<!--                            </select>-->
+<!--                        </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>账务日期：</label>-->
+                        <!--                                <input type="text" class="time-input" placeholder="请选择账务日期" name="CHECKINGDATE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>创建时间：</label>-->
+                        <!--                                <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>最后修改时间：</label>-->
+                        <!--                                <input type="text" class="time-input" placeholder="请选择最后修改时间" name="LASTUPDATETIMESTAMP"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>渠道：</label>-->
+                        <!--                                <input type="text" name="CHANNEL"/>-->
+                        <!--                            </li>-->
+<!--                        <li>-->
+<!--                            <label>奖品等级：</label>-->
+<!--                            <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}" style="width: 80px">-->
+<!--                                <option value="">所有</option>-->
+<!--                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
+<!--                                        th:value="${dict.dictValue}"></option>-->
+<!--                            </select>-->
+<!--                        </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>奖品项目编码：</label>-->
+                        <!--                                <input type="text" name="PROJECTCODE"/>-->
+                        <!--                            </li>-->
+                        <!--                            <li>-->
+                        <!--                                <label>请求来源：</label>-->
+                        <!--                                <input type="text" name="SOURCE"/>-->
+                        <!--                            </li>-->
+                        <li>
+                            <label>手机号：</label>
+                            <input type="text" name="PHONE"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">-->
+            <!--                    <i class="fa fa-plus"></i> 添加-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">-->
+            <!--                    <i class="fa fa-edit"></i> 修改-->
+            <!--                </a>-->
+            <!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">-->
+            <!--                    <i class="fa fa-remove"></i> 删除-->
+            <!--                </a>-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
-        var prefix = ctx + "activity/record";
-        var datas = [[${@dict.getType('prizeLevel')}]];
-        var prizetypes = [[${@dict.getType('prizeType')}]];
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
+    var prefix = ctx + "activity/record";
+    var datas = [[${@dict.getType('prizeLevel')}]];
+    var prizetypes = [[${@dict.getType('prizeType')}]];
+    var drawResults = [[${@dict.getType('drawResult')}]];
+    var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
+    var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "抽奖记录信息",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "抽奖记录信息",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'drawrecordid',
                     title: '主键',
                     visible: false
                 },
                 {
-                    field: 'drawtranseqno',
-                    title: '抽奖流水'
+                    field: 'userid',
+                    title: '用户标识'
+                },
+                {
+                    field: 'username',
+                    title: '用户名'
+                },
+                {
+                    field: 'phone',
+                    title: '手机号'
                 },
                 {
                     field: 'drawcode',
-                    title: '抽奖活动代码'
+                    title: '活动名称',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDrawname(drawInfoList, value);
+                    }
                 },
                 {
-                    field: 'userid',
-                    title: '用户标识'
+                    field: 'drawresult',
+                    title: '抽奖结果',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(drawResults, value);
+                    }
+                },
+                {
+                    field: 'prizecode',
+                    title: '奖品名称',
+                    formatter: function (value, row, index) {
+                        return $.table.selectprivename(drawPrizeList, value);
+                    }
                 },
                 {
                     field: 'DRAWTIME',
                     title: '抽奖时间'
                 },
                 {
-                    field: 'drawresult',
-                    title: '抽奖结果'
+                    field: 'drawtranseqno',
+                    title: '抽奖流水',
+                    visible: false
                 },
                 {
-                    field: 'prizecode',
-                    title: '奖品代码'
+                    field: 'projectcode',
+                    title: '奖品项目编码',
+                    visible: false
                 },
                 {
                     field: 'prizetype',
                     title: '奖品类型',
-                    formatter: function(value, row, index) {
+                    visible: false,
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(prizetypes, value);
                     }
                 },
                 {
                     field: 'CHECKINGDATE',
-                    title: '账务日期'
+                    title: '账务日期',
+                    visible: false
                 },
                 // {
                 //     field: 'CREATETIMESTAMP',
@@ -177,34 +221,29 @@
                 // },
                 {
                     field: 'channel',
-                    title: '渠道'
-                },
-                {
-                    field: 'username',
-                    title: '用户名'
+                    title: '渠道',
+                    visible: false,
                 },
+
                 {
                     field: 'prizelevel',
                     title: '奖品等级',
-                    formatter: function(value, row, index) {
+                    visible: false,
+                    formatter: function (value, row, index) {
                         return $.table.selectDictLabel(datas, value);
                     }
                 },
-                {
-                    field: 'projectcode',
-                    title: '奖品项目编码'
-                },
+
                 {
                     field: 'source',
-                    title: '请求来源'
-                },
-                {
-                    field: 'phone',
-                    title: '手机号'
+                    title: '请求来源',
+                    visible: false
                 },
+
                 {
                     field: 'extarea',
-                    title: '扩展域'
+                    title: '扩展域',
+                    visible: false
                 },
                 // {
                 //     title: '操作',
@@ -216,10 +255,10 @@
                 //         return actions.join('');
                 //     }
                 // }
-                ]
-            };
-            $.table.init(options);
-        });
-    </script>
+            ]
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>
\ No newline at end of file