From 0a4aee700a60c4b28248f3d1a7f4f91376b68492 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:46:47 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into shuangzheng2

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 4eaffd7..17c936a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -75,7 +75,7 @@
      * @param type
      *            用户类型 用户类型 1 小程序 2 运营平台 3 社区平台
      */
-    R<LoginUserInfoVO> getUserInfo(String name, int type);
+    R<LoginUserInfoVO> getUserInfo(String name, int type,String appId);
 
     /**
      * 三端获取登录用户信息
@@ -356,7 +356,7 @@
      *            所属app 1居民端app 2网格员端app 3商家端app
      * @return 协议内容
      */
-    R userAgreement(int type);
+    R userAgreement(int type,String appId);
 
     /**
      * 意见反馈
@@ -478,7 +478,7 @@
      *            1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
      * @return 协议内容
      */
-    R agreement(Integer type);
+    R agreement(Integer type,String appId);
 
     /**
      * 维护用户最后登录时间

--
Gitblit v1.7.1