Merge branch 'master' into test6.7

@@ -21,7 +21,8 @@ webpackJsonp([29],{
 	            is_valid:$("#is_valid").val(),
 	            sort_type:$("#sort_type").val(),
 	            show_status:$("#show_status").val(),
-	            title:common.util.__input('title')
+	            title:common.util.__input('title'),
+	            description : common.util.__input('description')
 	        };
 	    },
 	    columns: [{
@@ -31,6 +32,9 @@ webpackJsonp([29],{
 	        display: "促销名称",
 	        name: "title"        
 	    }, {
+	        display: "促销描述",
+	        name: "description"        
+	    }, {
 	        display: '优先级',
 	        name: "priority"
 	    }, {

@@ -57,6 +57,7 @@ module.exports={
                 {name:'show_status',type:'Number'},
                 {name: 'sort_type', type: 'Number'},
                 {name: 'title', type: 'string'},
+                {name: 'description', type: 'string'},
                 {name: 'page',type: 'Number'},
                 {name: 'size',type: 'Number'}
             ]

@@ -42,6 +42,9 @@
                     </select>
                 </div>
                 <div class="panel-col">
+                    <input name="description" id="description"  placeholder="输入描述的关键信息" class="form-control" />                        
+                </div>
+                <div class="panel-col">
                     <a id="filter-btn" href="javascript:void(0);" class="btn btn-info">筛选</a>
                     <a id="filter-all" href="/promotionInfo/index" class="btn btn-info">全部</a>
                 </div>