Merge branch 'dev' into dev_hrh_global

haorenhui

2023-10-27 1499d8149575493519f2c5b04462c2302a455aa9

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def

@@ -36,6 +36,7 @@
        Image: 'CAR_CYAN'
        Label: '自动生成规则'
        Taborder: 2
        Visible: false
      ]
    }
  ]