Merge branch 'huacheng' into huacheng_test

101captain

2022-06-30 cc595b0aa24773735417accd0158da6ac98a6db0

 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);
    }
}