From 2b31fa203f3435a582be51f45899d99164c9917a Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期四, 09 四月 2026 13:34:59 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/SC/gfzl

---
 RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java
index e7d9e7e..f20fe76 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java
@@ -68,7 +68,7 @@
      * 鍑哄彾涓濈巼
      */
     @ExcelProperty(value = "鍑哄彾涓濈巼")
-    private Long slkrate;
+    private Long silkrate;
 
     /**
      * 鍌ㄤ笣鏌滈噸閲�
@@ -106,7 +106,17 @@
     private List<StoreSilkDetailVo> rollerDetailList;
 
     /**
-     * 鍖呰鏈轰骇閲忔槑缁�
+     * 鍖呰鏈轰骇閲忔槑缁嗭紙鏈�缁堢粨鏋滐級
      */
     private List<StoreSilkDetailVo> packerDetailList;
+
+    /**
+     * 鍗锋帴鏈烘搷浣滆繃绋嬭褰曪紙澧炲噺鏄庣粏锛�
+     */
+    private List<StoreSilkDetailVo> rollerRecordList;
+
+    /**
+     * 鍖呰鏈烘搷浣滆繃绋嬭褰曪紙澧炲噺鏄庣粏锛�
+     */
+    private List<StoreSilkDetailVo> packerRecordList;
 }

--
Gitblit v1.9.3