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

lihongji

2024-11-15 c6e8187d8a90489b985609fe7d94d4996ecee491

 _Main/UI/MacroPlannerWebApp/Component_FormLockPeriod/_ROOT_Component_FormLockPeriod.def

@@ -10,4 +10,9 @@
    #child: PanelLockPeriod
    #child: PanelLockPeriod633
  ]
  Properties:
  [
    Image: 'GEAR_VIEW'
    Title: 'Lock period data'
  ]
}