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

yypsybs

2023-10-13 74438a1bb35d23639e050f3afbcaa2199780af5d

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def

@@ -27,6 +27,18 @@
        Taborder: 1
      ]
    }
    Component AutomaticallyGenerate
    {
      #keys: '[414702.1.14342122]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'CAR_CYAN'
        Label: '自动生成规则'
        Taborder: 2
        Visible: false
      ]
    }
  ]
  Properties:
  [