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

limj

2023-09-21 89c96171bb971dcaed7cf289b58ef44ca689523c

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def

@@ -7,6 +7,7 @@
  BaseType: 'WebForm'
  Children:
  [
    #child: MatrixEditorCapacityAndSaleBudgeCompare
    Component ButtonCapacityAndSaleBudgeCompare
    {
      #keys: '[414384.0.818241675]'