zhangshi_app_backend.git

			@@ -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);
			}



			}