From 440be21e24e4cfb15e85ee1cf8522cd7d4acf21b Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 20 十一月 2024 16:36:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def
index 04859c6..ca1aad0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def
@@ -7,8 +7,8 @@
   BaseType: 'WebForm'
   Children:
   [
-    #child: pnlContent
     #child: pnlActions
+    #child: pnlContent
   ]
   Properties:
   [

--
Gitblit v1.9.3