Merge branch 'master-order' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/vo/OrderActivityVo.java

@@ -4,6 +4,7 @@ import com.xxfc.platform.order.entity.OrderActiveDetail;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 public class OrderActivityVo extends OrderActiveDetail {
@@ -15,7 +16,7 @@ public class OrderActivityVo extends OrderActiveDetail {
 	//订单号
 	private String orderNo;
 	//下单时间
-	private Long orderTime;
+	private Date orderTime;
 
 	//订单实际金额
 	private BigDecimal realAmount;