From 250e2cd3c6b63605d2d23d496884ff18fac5e536 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 23 十二月 2024 17:15:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 9aa2b87..c60e249 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -24,15 +24,20 @@
carWidth: 6200 #澶ц溅瀹藉害
slotWidth: 6200 #澶ц溅瀹藉害
inCarMaxSize: 5 #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
- outCarMaxSize: 3 #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
+ outCarMaxSize: 6 #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
glassGap: 250 #鐜荤拑闂磋窛
xMaxSize: 2800
+ slotMaxHeight: 2500
+ slotMaxthickness: 12
+ temperingOutTargetPosition: 930
+ artificialOutTargetPosition: 931
+
scan:
ip: 192.168.30.199
port: 5000
kangaroohy:
milo:
- enabled: true
+ enabled: false
primary: default
config:
default:
--
Gitblit v1.8.0