From bb37b8ff2eac4cb2ab9997a50bf68f5bde16d661 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 08 九月 2022 15:23:37 +0800
Subject: [PATCH] Merge branch 'huacheng_push' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 4e6c3c1..323cbc9 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
@@ -38,7 +38,7 @@
      *            用户在开放平台的唯一标识符
      * @return token
      */
-    R updateInsertUser(String openid, String sessionKey, String unionid);
+    R updateInsertUser(String openid, String sessionKey, String unionid,String appId);
 
     /**
      * 维护小程序用户基本信息 头像 昵称 性别
@@ -860,7 +860,7 @@
      * @param streetId 街道id
      * @param areaCode 区县code
      * */
-    R newIndexData(Integer type, Long streetId,Long areaCode);
+    R newIndexData(Integer type, Long streetId,Long areaCode,String appid);
 
     /**
      * 用户占比统计
@@ -868,7 +868,7 @@
      * @param streetId 街道id
      * @param areaCode 区县code
      * @param range  */
-    R userRate(Integer type, Long streetId, Long areaCode, Integer range);
+    R userRate(Integer type, Long streetId, Long areaCode, Integer range,String appId);
 
     /**
      * 真实用户占比统计
@@ -876,7 +876,7 @@
      * @param streetId 街道id
      * @param areaCode 区县code
      * @param range  */
-    R realUser(Integer type, Long streetId, Long areaCode, Integer range);
+    R realUser(Integer type, Long streetId, Long areaCode, Integer range,String appId);
 
 
     /**
@@ -912,7 +912,7 @@
      * @param account
      * @return
      */
-    R resetPassword(Integer type,String account);
+    R resetPassword(Integer type,String account,String appId);
 
     /**
      * 天府通办登录

--
Gitblit v1.7.1