Merge branch 'haucheng_panzhihua' into huacheng_test

101captain

2022-08-09 9d53292f41f54a6d740680195723c3e19f2ed62d

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

@@ -912,4 +912,11 @@
     * @return
     */
    R resetPassword(Integer type,String account);

    /**
     * 天府通办登录
     * @param uuLoginVO
     * @return
     */
    R tfLogin(UuLoginVO uuLoginVO);
}