Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-15 d2d1e174b5f85497c38ec1a02e8dc78421aa3c71

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pStockingPoint.def

@@ -12,7 +12,7 @@
      Databinding: 'StockingPoint_MP'
      Children:
      [
        Component deContent
        Component deStockingPoint
        {
          #keys: '[414996.1.206961944]'
          BaseType: 'WebDataExtractor'