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