Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-11 e8ba145debbace4e1016d854ccd0a92f3403fd5e

 _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:
  [