Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

lidongdong

2022-09-23 edf2bc6f41c9784e9cdccc9b569a7091a5a5a438

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -912,7 +912,7 @@
     * @param account
     * @return
     */
    R resetPassword(Integer type,String account);
    R resetPassword(Integer type,String account,String appId);

    /**
     * 天府通办登录
@@ -920,4 +920,11 @@
     * @return
     */
    R tfLogin(UuLoginVO uuLoginVO);

    /**
     * 用户授权
     * @param userId
     * @return
     */
    R accept(Long userId);
}