From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Mon, 17 Feb 2025 11:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116' into dev-20250116
---
exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java b/exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java
index dec9855..9500fad 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/entity/NonCoalPayStudent.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -12,6 +13,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.Date;
/**
@@ -95,8 +97,15 @@
@ApiModelProperty("财政缴款凭证")
private String fileData;
- @ApiModelProperty("财政缴费状态0未缴费1缴费中2完成缴费")
- private Long govPayStatus;
+ @ApiModelProperty("缴费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ /**
+ * 财政订单状态0未生成1生成中2未生成
+ */
+ @ApiModelProperty("财政订单状态0未生成1生成中2未生成")
+ private Integer govPayStatus;
/**
* 删除标志（0代表存在2代表删除）
*/
@@ -225,12 +234,19 @@
this.fileData = fileData;
}
- public Long getGovPayStatus() {
+ public Date getPayTime() {
+ return payTime;
+ }
+
+ public void setPayTime(Date payTime) {
+ this.payTime = payTime;
+ }
+
+ public Integer getGovPayStatus() {
return govPayStatus;
}
- public void setGovPayStatus(Long govPayStatus) {
+ public void setGovPayStatus(Integer govPayStatus) {
this.govPayStatus = govPayStatus;
}
-
}
\ No newline at end of file
--
Gitblit v1.9.2