Merge branch 'huacheng_push' into haucheng_panzhihua

zhaozhengjie

2022-09-09 49622eb255ea7f29daed3241baf62873ba7d362a

 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