Merge branch 'dev_addFilterCondition' into grey

@@ -10,7 +10,9 @@ module.exports={
             title: "查询模板列表接口",
             url: "/activityTemplate/selectTemplateList",
             params: [
-                {name: "status", type: "number"}
+                {name: "status", type: "number"},
+                {name: 'page', type: 'Number'},
+                {name: 'size', type: 'Number'}
             ]
         },
         addTemplate:{

@@ -10,6 +10,7 @@ var statusArr = ["已关闭", "已开启"];
 
 var g = new common.grid({
     el: '#content-list',
+    usepagesize:true,
     columns: [
         {
             display: "ID",