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

lihongji

2024-10-17 0dc9f85a5442956570399722b5636387942ff827

 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelRibbon322.def

@@ -53,9 +53,8 @@
      Properties:
      [
        Image: 'C_CLAMP'
        Label: 'Create'
        Label: 'Create base data'
        Taborder: 0
        Visible: false
      ]
    }
    Component ButtonRibbon682