From 0c8c1b9423d9a1d2dc16649ed22267145aa589a3 Mon Sep 17 00:00:00 2001
From: tangxbbaba <784173113@qq.com>
Date: 星期六, 14 八月 2021 11:11:29 +0800
Subject: [PATCH] Merge branch 'txb'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 09910e3..bb6252c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -128,11 +128,11 @@
 
     /**
      *分页查询人口管理
-     * @param loginUserInfoVO 查询参数
+     * @param userInfoVO 查询参数
      * @return 分页数据
      */
     @PostMapping("pageuser")
-    R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO);
+    R pageUser(@RequestBody AppletUserInfoVO userInfoVO);
 
     /**
      * 查询所有人员标签

--
Gitblit v1.7.1