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

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2532,7 +2532,7 @@ public class OrderServiceImpl implements Orderservice {
             orderExtInfoDto.setSendPointValidityDateDays(sendPoint.getValidityDateDays());
             orderExtInfoDto.setSendPointMaxNum(sendPoint.getMaxNum());
             orderExtInfoDto.setSendPointActivityCode(sendPoint.getActivityCode());
-            orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime());
+            orderExtInfoDto.setSendPointEndTime(sendPoint.getEndTime().getTime()+"");
             orderExtInfoDto.setSendPointSendPoint(sendPoint.getSendPoint());
         }
         return orderExtInfoDto;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -177,7 +177,7 @@ public class OrderExtInfoDto {
     private String thirdPartyMemberId;
 
     private String sendPointActivityCode;
-    private Date sendPointEndTime;
+    private String sendPointEndTime;
     private Integer sendPointSendPoint;
     private Integer sendPointMaxNum;
     private Integer sendPointValidityDateDays;