From d1b5cafeaf5d26a762350c04ebb02ea5b3b8ee7c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 24 七月 2025 10:39:15 +0800
Subject: [PATCH] 运费优化
---
main-business/src/main/java/com/ruoyi/business/entity/EquipmentUsageRecord.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/EquipmentUsageRecord.java b/main-business/src/main/java/com/ruoyi/business/entity/EquipmentUsageRecord.java
index b4d0fc3..b9c9e9b 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/EquipmentUsageRecord.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/EquipmentUsageRecord.java
@@ -1,6 +1,7 @@
package com.ruoyi.business.entity;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.ruoyi.common.core.domain.MyBaseEntity;
@@ -29,10 +30,15 @@
@TableField(value = "equipment_id")
private Long equipmentId;
/**
- * 浣跨敤鏁伴噺
+ * 棰嗙敤鏁伴噺
*/
@TableField(value = "usage_quantity")
private Integer usageQuantity;
+ /**
+ * 褰掕繕鏁伴噺
+ */
+ @TableField(value = "return_quantity")
+ private Integer returnQuantity;
/**
* 浣跨敤浜篒D
*/
@@ -44,19 +50,21 @@
@TableField(value = "department_id")
private Long departmentId;
/**
- * 璁惧鐘舵�侊紙姝ｅ父/鏁呴殰/缁翠慨涓級
+ * 璁惧鐘舵�侊紙1浣跨敤涓紝2宸插綊杩橈級
*/
@TableField(value = "equipment_status")
- private String equipmentStatus;
+ private Integer equipmentStatus;
/**
* 浣跨敤寮�濮嬫椂闂�
*/
@TableField(value = "usage_start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate usageStartTime;
/**
* 浣跨敤缁撴潫鏃堕棿
*/
@TableField(value = "usage_end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate usageEndTime;
/**
* 澶囨敞淇℃伅
--
Gitblit v1.9.3