Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb

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

@@ -144,6 +144,9 @@
    @GetMapping("resetPassword")
    R resetPassword(@RequestParam("userId") Long userId);

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

    /**
     * 批量重置密码用户登录密码默认admin123456
     *
@@ -697,7 +700,7 @@
     * @return 协议内容
     */
    @PostMapping("agreement")
    R agreement(@RequestParam("type") Integer type);
    R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);

    /**
     * 维护用户最后登录时间
@@ -1264,4 +1267,7 @@
     */
    @GetMapping("/uuPush")
    R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);

    @GetMapping("/communityList")
    R communityList(@RequestParam("name") String name, @RequestParam("id") Long  id);
}