From a746b44994e729613737baa922796383027fc54c Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 14 十一月 2024 16:59:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlanCC.def | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def" b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlanCC.def
similarity index 63%
copy from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def"
copy to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlanCC.def
index ff7f552..54a20a0 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlan\043780.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlShiftPlanCC.def
@@ -1,13 +1,13 @@
Quintiq file version 2.0
-Component pnlShiftPlan id:pnlShiftPlan_780
+Component pnlShiftPlanCC
{
- #keys: '[415136.0.1255982410]'
+ #keys: '[415136.0.1303133147]'
BaseType: 'WebPanel'
Children:
[
- Component lblShiftPlan
+ Component lblShiftPlanCC
{
- #keys: '[415136.0.1255982411]'
+ #keys: '[415136.0.1303133148]'
BaseType: 'WebLabel'
Properties:
[
@@ -15,9 +15,9 @@
Taborder: 0
]
}
- Component cbShiftPlan
+ Component cbShiftPlanCC
{
- #keys: '[415136.0.1255982412]'
+ #keys: '[415136.0.1303133149]'
BaseType: 'WebCheckbox'
Properties:
[
--
Gitblit v1.9.3