From 3c12858927ce26f277ba758e520c81be599d8df1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 15:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java
index 55a9003..3e695f7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java
@@ -3,7 +3,9 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import javax.naming.PartialResultException;
import java.math.BigDecimal;
+import java.util.Date;
/**
* 购课记录列表VO
@@ -43,7 +45,7 @@
private String payUser;
private String phone;
// 学员id
- private Integer studentId;
+ private String studentId;
private String payStudent;
private Integer payType;
private BigDecimal originalPrice;
@@ -68,4 +70,7 @@
private Integer buyType;
// 当状态为手动支付时使用 用于显示手动支付时显示操作人
private String buyTypeName;
+ private Integer classHours;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ private Date insertTime;
}
--
Gitblit v1.7.1