Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

3 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

 cloud-server-activity/src/main/java/com/dsh/activity/util/PayMoneyUtil.java

@@ -411,6 +411,7 @@
        request.amount = new PartnerAppPrepay.CommonAmountInfo();
        request.amount.total = (long) i;// 金额 单位分
        request.amount.currency = "CNY";
        request.attach="";// 额外参数
        String prepayId ="";
        Map<String, Object> map3 = new HashMap<>();
        try {