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

无关风月

2 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-activity/src/main/java/com/dsh/activity/service/PayHuiminService.java

@@ -37,7 +37,7 @@
    Map<String, BigDecimal> getStaticsData(HuiminPayQuery query);

    /**
     * 退款惠民卡
     * 退款玩湃惠民卡
     * @param id
     */
    ResultUtil<?> refund(Integer id) throws AlipayApiException;