Merge branch 'dev'

renhao

2023-10-18 ff1d40a1a235da7c3bdfa26070af267f19c7a3d3

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudge/_ROOT_Component_FormCapacityAndSaleBudge.def

@@ -19,18 +19,6 @@
        Taborder: 1
      ]
    }
    Component ButtonExportTest
    {
      #keys: '[414384.0.914711826]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'EXPORT1'
        Label: '导出测试'
        Taborder: 2
        Visible: false
      ]
    }
    Component ButtonGenerateTestData
    {
      #keys: '[414384.0.971540693]'
@@ -38,7 +26,7 @@
      Properties:
      [
        Image: 'IMPORT1'
        Label: '根据筛选月份生成测试数据'
        Label: '根据筛选年份生成测试数据'
        Taborder: 0
      ]
    }