From 8f6ebf95e57c6f39ec11002de79bf6ed16844a5c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 30 八月 2025 10:44:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

---
 src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
index 96c6676..9ecfaf4 100644
--- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
@@ -27,6 +27,7 @@
         private Double roughWeight;//	鏄�	灏忔暟鍨�	閲嶉噺  姣涢噸
         private Double anfme=1.0;//	鏄�	灏忔暟鍨�	 //榛樿
         private Double rollExtent;//	鏄�	灏忔暟鍨�	鍗烽暱搴�
+        private int joint;//	鏄�	鏁村瀷	鎺ュご
 
     }
 

--
Gitblit v1.9.1