Merge remote-tracking branch 'origin/master'

xuhy

2025-02-10 078ce36a32bc6679f32e42fd18a9cbb454ff7b7d

 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;

}