From 1582adad85898e246fbd0cbdabde9ac6b990bb8e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 17 二月 2025 14:41:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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..6a50c67 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
@@ -84,12 +84,15 @@
@TableField("pictures")
private String pictures;
- @ApiModelProperty(value = "验收结果 1=合格 2=不合格")
+ @ApiModelProperty(value = "验收结果 1=合格 0=不合格")
@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