Merge branch 'master' into release/rc

service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/RefundServiceImpl.java

@@ -242,7 +242,7 @@ public class RefundServiceImpl implements RefundService {
     paramMap.put("refundAmount", record.getTransAmount());
     paramMap.put("refundCommodity", record.getRemark());
     paramMap.put("refundReason", record.getRemark());
-    paramMap.put("time", DateFormatUtils.format(record.getSuccessTime(), "yyyy-MM-dd HH:mm:ss"));
+    paramMap.put("time", DateFormatUtils.format(e.getSuccessTime(), "yyyy-MM-dd HH:mm:ss"));
     List<Map<String, Object>> paramList = Lists.newArrayList(paramMap);
 
     SendCommonMsgEvent event = new SendCommonMsgEvent();