From 1769107c38d40f7d209a48ab7752fe27a81b9709 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 14 四月 2026 17:48:18 +0800
Subject: [PATCH] fix:1.出库台账(删除出库记录查询结果有误)增加批号和供应商 2.出入库不合格管理加批号和供应商 3.发货以及发货记录(部分发货)

---
 src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java |   14 +++++++-------
 1 files changed, 7 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..96803c5 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,16 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+
+    @ApiModelProperty("鍗曚綅")
+    private String unit;
+
     @ApiModelProperty("閮ㄩ棬id")
     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