Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-29 9668ce3911266c1c3810c047408cc58e03086139

 src/main/java/com/moral/common/bean/PageBean.java

@@ -24,7 +24,8 @@
    private Integer pageIndex;    // 第几页

    private Integer pageSize;    // 每页记录数

    private Integer pages;        // 总页数

    private String queryParams;

    private String queryParams; //查询参数

    private String orderByClause;//排序条件

    private Integer size;        // 当前页的数量 <= pageSize，该属性来自ArrayList的size属性

    

    /**