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

hongji.li

2023-09-21 ff38e3818081fdb34a689b60b7086cbd85c30ee8

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def

@@ -7,6 +7,7 @@
  BaseType: 'WebForm'
  Children:
  [
    #child: MatrixEditorCapacityAndSaleBudgeCompare
    Component ButtonCapacityAndSaleBudgeCompare
    {
      #keys: '[414384.0.818241675]'
@@ -17,7 +18,6 @@
        Taborder: 0
      ]
    }
    #child: MatrixEditorCapacityAndSaleBudgeCompare
  ]
  Properties:
  [