Merge branch 'dev' into dev_yy

yanyuan

2023-11-01 c673b37d38537c136cd488b8430146573975d5e3

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def

@@ -8,27 +8,7 @@
  Children:
  [
    #child: MatrixEditorCapacityAndSaleBudgeCompare
    Component ButtonCapacityAndSaleBudgeCompare
    {
      #keys: '[414384.0.818241675]'
      BaseType: 'WebButton'
      Properties:
      [
        Label: '刷新'
        Taborder: 0
      ]
    }
    Component ButtonExportCompare
    {
      #keys: '[414384.0.881345277]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'EXPORT1'
        Label: '导出'
        Taborder: 1
      ]
    }
    #child: pButton
  ]
  Properties:
  [