Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj

hongji.li

2023-10-10 4b15cdb0ac0b85f53072e0320730f01547bf1cec

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_PanelImportAndExport.def

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