Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-20 241408b071cb1b43d9307ae9c75c82bb77b6faa7

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -145,7 +145,7 @@
    R resetPassword(@RequestParam("userId") Long userId);

    @GetMapping("/resetPasswordAccount")
    R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account);
    R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId);

    /**
     * 批量重置密码用户登录密码默认admin123456
@@ -1274,4 +1274,9 @@

    @PostMapping("/tfLogin")
    R tfLogin(@RequestBody UuLoginVO uuLoginVO);


    @GetMapping("/accept")
     R accept(@RequestParam("userId")Long userId);

}