From 3d65ee18d645a30e600c9b63f0daefe2fc2b1151 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 13 十一月 2024 15:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration#812.def | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
index 7417951..0cf42ce 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pGeneration\043812.def"
@@ -15,7 +15,6 @@
Taborder: 1
]
}
- #child: ListGenerations_529
Component dhCheckGenerations
{
#keys: '[414996.1.209190767]'
@@ -42,10 +41,13 @@
Taborder: 2
]
}
+ #child: ListGenerations_529
]
Properties:
[
- MinimumRows: 20
+ FixedSize: true
+ MinimumColumns: 8
+ MinimumRows: 15
Taborder: 0
Title: 'Generation'
]
--
Gitblit v1.9.3