Merge branch 'dev' into dev_lrs

xiaoding721

2023-11-07 879b0d420555704579c76cf3234c61010539d6fc

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Component_pButton.def

@@ -27,6 +27,16 @@
        Taborder: 1
      ]
    }
    Component Image116
    {
      #keys: '[414702.1.375948796]'
      BaseType: 'WebImage'
      Properties:
      [
        Image: 'CHECK'
        Taborder: 2
      ]
    }
  ]
  Properties:
  [