From 078ce36a32bc6679f32e42fd18a9cbb454ff7b7d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 10 二月 2025 11:38:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java
index ecf9eb2..4a266e8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java
@@ -86,10 +86,13 @@
@ApiModelProperty(value = "验收结果 1=合格 2=不合格")
@TableField("check_result")
- private Integer checkResult;
+ private Boolean checkResult;
@ApiModelProperty(value = "验收结算金额")
@TableField("check_money")
private BigDecimal checkMoney;
+ @ApiModelProperty(value = "验收状态 待验收 已验收")
+ @TableField("status")
+ private String status;
}
--
Gitblit v1.7.1