Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

postdischarge-common/src/main/java/com/xinelu/common/core/controller/BaseController.java

@@ -78,6 +78,8 @@ public class BaseController {
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setMsg("查询成功");
         rspData.setRows(list);
+        // 返回 页码
+        rspData.setPageNum(new PageInfo(list).getPageNum());
         rspData.setTotal(new PageInfo(list).getTotal());
         return rspData;
     }

postdischarge-common/src/main/java/com/xinelu/common/core/page/TableDataInfo.java

@@ -15,7 +15,10 @@ public class TableDataInfo implements Serializable {
      * 总记录数
      */
     private long total;
-
+    /**
+     * 页码
+     */
+    private long pagenum;
     /**
      * 列表数据
      */
@@ -56,6 +59,11 @@ public class TableDataInfo implements Serializable {
         this.total = total;
     }
 
+    public  long getPageNum(){return pagenum;}
+
+    public void setPageNum(long pn){ this.pagenum = pn;}
+
+
     public List<?> getRows() {
         return rows;
     }