From 7b973b3b9b723f48c54f2c0c5083886573224541 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 05 一月 2026 16:40:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml
index b3dc04d..9b4eb06 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml
@@ -594,7 +594,6 @@
       <Property name="caption">缁撶畻淇℃伅</Property>
       <Property name="width">65%</Property>
       <Property name="closeable">false</Property>
-      <Property name="height">70%</Property>
       <Buttons>
         <Button id="btnOK">
           <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;

--
Gitblit v1.9.3