Merge branch 'local_20221010' into huacheng_test

yanghui

2022-10-10 a366530662bd20eb8bfd7fcfb72deb003baff923

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java

@@ -219,4 +219,10 @@
        Map map=umfPayUtil.pay(orderid, DateUtils.getCurrentDateString(),openid,amount);
        return R.ok(map);
    }
    @ApiOperation("无水洗车下单接口")
    @GetMapping("/wsPay")
    public R wsPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){
        Map map=umfPayUtil.pay2(orderid, DateUtils.getCurrentDateString(),openid,amount);
        return R.ok(map);
    }
}