From e529b1dd89b5f2927457a284e660d489b9aa8cc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 01 四月 2026 11:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

---
 src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 5c58f53..4427f91 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -1,6 +1,5 @@
 package com.ruoyi.stock.dto;
 
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.stock.pojo.StockInRecord;
 import lombok.Data;
 
@@ -19,6 +18,7 @@
      * 浜у搧鍗曚綅
      */
     private String unit;
+    private String uidNo;
 
     private String timeStr;
 
@@ -26,4 +26,5 @@
 
     //鐜板瓨閲�
     private String currentStock;
+
 }

--
Gitblit v1.9.3