From bd0871adf2e072aef8176f1e71a8cb89f28a544b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期五, 06 十月 2023 22:24:04 +0800
Subject: [PATCH] 47813468

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index a473bbe..b9de3a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.zhang;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -27,6 +28,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.websocket.server.PathParam;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -245,6 +247,16 @@
         util.exportExcel(response,list,"瀹惰氨璁板綍鏁版嵁");
     }
 
+    /**
+     * 瀹惰氨2.0
+     */
+    @GetMapping("/list/genealogy2")
+    public AjaxResult listGenealogy2(Genealogy genealogy){
+        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+        return zInfoUserService.listGenealogy2(genealogy,pageNum,pageSize);
+    }
+
 
 
 }

--
Gitblit v1.9.1