Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantPaymentOrderServiceImpl.java

@@ -254,7 +254,10 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 						if (status.equals(DealStatusEnum.SUCCESS)) {
 							order.setPayTime(new Date());
 						} else {
-							order.setMemo(rpMap.get("remarks").toString());
+							Object remarks = rpMap.get("remarks");
+							if (remarks != null) {
+								order.setMemo(remarks.toString());
+							}
 						}
 						order.setStatus(status);
 						order.setTransNo(rpMap.get("orderNo").toString());