From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期一, 17 二月 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/dto/rep/NonCoalPayDetailH5RepDto.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java b/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java
index c1dd6b4..5c5ec8e 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalPayDetailH5RepDto.java
@@ -34,8 +34,8 @@
     @ApiModelProperty("缴费状态0否1是")
     private Integer payStatus;
 
-//    @ApiModelProperty("待定财政缴费状态0未缴费1缴费中2完成缴费")
-//    private Long govPayStatus;
+    @ApiModelProperty("待定财政缴费状态0未缴费1缴费中2完成缴费")
+    private Long govPayStatus;
 
     @ApiModelProperty("缴费凭证")
     private String fileData;

--
Gitblit v1.9.2