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

yypsybs

2023-09-27 56fd7e8181fa8db461333e0451cbabbf03f290f9

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/_ROOT_Component_FormCapacityAllocationResults.def

@@ -8,17 +8,7 @@
  Children:
  [
    #child: ListCapacityAllocationResults
    Component ButtonGenerateCapacityAllocationResults
    {
      #keys: '[414702.0.340677556]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'PROCESS'
        Label: '生成数据'
        Taborder: 0
      ]
    }
    #child: PanelCapacityAllocationResults
  ]
  Properties:
  [