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

张天森

2022-07-08 3983e5809d0ed2ce551a157a1b5b326b217c9b9c

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

@@ -211,7 +211,7 @@
    @ApiOperation("uu洗车下单接口")
    @GetMapping("/uuPay")
    public R uuPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){
        Map map=umfPayUtil.pay(openid, DateUtils.getCurrentDateString(),openid,amount);
        Map map=umfPayUtil.pay(orderid, DateUtils.getCurrentDateString(),openid,amount);
        return R.ok(map);
    }
}