Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-08 bb37b8ff2eac4cb2ab9997a50bf68f5bde16d661

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -1442,8 +1442,8 @@
    }

    @GetMapping("/resetPasswordAccount")
    public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account){
        return userService.resetPassword(type,account);
    public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
        return userService.resetPassword(type,account,appId);
    }

    @PostMapping("/tfLogin")