Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-14 a746b44994e729613737baa922796383027fc54c

 _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlanCC.def

copy from "_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan\043679.def"
copy to _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlanCC.def
文件从 _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Component_pnlAssembleOnlinePlan#679.def 复制
@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component pnlAssembleOnlinePlan id:pnlAssembleOnlinePlan_679
Component pnlAssembleOnlinePlanCC
{
  #keys: '[415136.0.1255982426]'
  #keys: '[415136.0.1303133150]'
  BaseType: 'WebPanel'
  Children:
  [
    Component lblAssembleOnlinePlan
    Component lblAssembleOnlinePlanCC
    {
      #keys: '[415136.0.1255982427]'
      #keys: '[415136.0.1303133151]'
      BaseType: 'WebLabel'
      Properties:
      [
@@ -15,9 +15,9 @@
        Taborder: 0
      ]
    }
    Component cbAssembleOnlinePlan
    Component cbAssembleOnlinePlanCC
    {
      #keys: '[415136.0.1255982428]'
      #keys: '[415136.0.1303133152]'
      BaseType: 'WebCheckbox'
      Properties:
      [