Merge branch 'huacheng_test' into huacheng

张天森

2022-07-13 4991803c78280508a478c4942b83bf63b48d307b

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

@@ -1222,7 +1222,6 @@
    @PostMapping("/update/user/party/status")
    R updateUserPartyStatus(@RequestParam("userId") Long userId);


    /**
     *导出验证密码
     */
@@ -1255,8 +1254,6 @@

    @GetMapping("/indexData/getAreaAndStreet")
    R getAreaAndStreet();
                   @RequestParam(value = "type",required = false) Long streetId);

    /**
     * uu洗车推送
     * @param washPhone