Merge branch 'haucheng_panzhihua' into shuangzheng2

101captain

2022-08-01 0a4aee700a60c4b28248f3d1a7f4f91376b68492

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java

@@ -40,7 +40,7 @@
        Map reqMap = new HashMap();
        reqMap.put("mer_id","53461");
        reqMap.put("notify_url",notifyUrl);
        reqMap.put("goods_inf","商品描述");
        reqMap.put("goods_inf","uu洗车服务");
        reqMap.put("order_id",orderid);
        reqMap.put("mer_date",merdate);
        reqMap.put("amount",amount);