Merge remote-tracking branch 'origin/huacheng_test' into huacheng

张天森

2022-07-18 2ccdf3184f80a49284b1137230e17189fa3ff965

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

@@ -1414,6 +1414,19 @@
        return userService.checkExport(account,password,oldPassword);
    }

    /**
     * uu洗车推送
     * @param washPhone
     * @param phone
     * @param washName
     * @param orderStatus
     * @return
     */
    @GetMapping("/uuPush")
    public R uuPush(@RequestParam(value = "washPhone",required = false)String washPhone,@RequestParam("phone")String phone,@RequestParam(value = "washName",required = false)String washName,@RequestParam("orderStatus")Integer orderStatus){
        return userService.uuPush(washPhone,phone,washName,orderStatus);
    }

    @GetMapping("/indexData/getAreaAndStreet")
    public R getAreaAndStreet(){
        return userService.getAreaAndStreet();
@@ -1423,4 +1436,5 @@
    public R getCommunityList(@RequestParam(value = "type") Integer type){
        return userService.getCommunityList(type);
    }

}