From 8c8f19c87c9dfa7576f04ad80d864b37d0617786 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 15 一月 2026 09:38:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
index 51c0360..b0082b3 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
@@ -104,7 +104,7 @@
* 鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�
*/
@ApiModelProperty("鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
- @Excel(name = "鐘舵��", readConverterExp = "1=鏈夋晥,2=閫炬湡")
+ @Excel(name = "鐘舵��", readConverterExp = "1=鏈夋晥,2=閫炬湡,3=鍗冲皢鍒版湡")
private Integer status;
/**
@@ -137,4 +137,16 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("閮ㄩ棬id")
+ private Long deptId;
+
+ @ApiModelProperty("瀹夎浣嶇疆")
+ private String installationLocation;
+
+ @ApiModelProperty("妫�瀹氬崟浣�")
+ private String unit;
+
+ @ApiModelProperty("妫�瀹氬懆鏈�(澶�)")
+ private Long cycle;
+
}
--
Gitblit v1.9.3