Merge branch 'master-v32-xwx' into 'master'

告警模板分页展示错误



See merge request !861

@@ -264,7 +264,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
             , end: function (e) {
             , end: function (e) {
                 form.render();
                 form.render();
             }
             }
-            , limit: 20
             , even: true
             , even: true
             , cols: [[
             , cols: [[
                 {type: 'checkbox'}
                 {type: 'checkbox'}