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

lihongji

2024-10-24 b99e22c06c023b82d5062fee06e2f8a29ce04977

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763.def

@@ -53,6 +53,19 @@
        Taborder: 2
      ]
    }
    Component rbgTimeUnit
    {
      #keys: '[414996.1.158400570]'
      BaseType: 'WebRadioButtonGroup'
      Properties:
      [
        BoundValue: 'Day'
        ButtonLabels: 'Day;Week;Month'
        ButtonValues: 'Day;Week;Month'
        Orientation: 'horizontal'
        Taborder: 3
      ]
    }
  ]
  Properties:
  [