From 9ea93abc2606948e5724316a4a3ec338ea14a130 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 17 十一月 2025 13:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

---
 src/main/java/com/zy/asrs/entity/PlaLog.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/PlaLog.java b/src/main/java/com/zy/asrs/entity/PlaLog.java
index f9b42ef..7a02c6e 100644
--- a/src/main/java/com/zy/asrs/entity/PlaLog.java
+++ b/src/main/java/com/zy/asrs/entity/PlaLog.java
@@ -67,7 +67,7 @@
     //鍖呰鍙�
     @TableField("package_no")
     @ExcelProperty(value = "鍖呰鍙�")
-    private String packageNo;
+    private Integer packageNo;
 
     //鍖呰鍙�
     @ExcelProperty(value = "鐢熶骇鏃ユ湡")
@@ -236,6 +236,10 @@
     @TableField("memo")
     private String memo;
 
+    @TableField("lactide_content")
+    @ExcelProperty(value = "涓欎氦閰惈閲�,%")
+    private Double lactideContent;
+
     public String getPakinTime$() {
         if (Cools.isEmpty(this.pakinTime)){
             return "";

--
Gitblit v1.9.1