From b9c032d96e236d9c45ca748be63a327755b82a06 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期四, 20 二月 2025 13:43:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java index d92a968..74decae 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java @@ -37,6 +37,10 @@ @TableField("tenant_id") private String tenantId; + @ApiModelProperty(value = "物品分类id") + @TableField("item_type_id") + private String itemTypeId; + @ApiModelProperty(value = "物品id") @TableField("item_id") private String itemId; @@ -70,9 +74,8 @@ private Integer repairType; @ApiModelProperty(value = "上门时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("visit_time") - private LocalDateTime visitTime; + private String visitTime; @ApiModelProperty(value = "联系电话") @TableField("contact_number") @@ -103,6 +106,13 @@ @TableField("attachment") private String attachment; + @ApiModelProperty(value = "附件名称 逗号分割") + @TableField("attachment_name") + private String attachmentName; + @ApiModelProperty(value = "维修单号") + @TableField("code") + private String code; + @ApiModelProperty(value = "状态 1=待处理 2=已处理") @TableField("status") private Integer status; -- Gitblit v1.7.1