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

lihongji

2024-11-14 a746b44994e729613737baa922796383027fc54c

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlContent.def

@@ -12,21 +12,11 @@
      Properties:
      [
        Label: '锁定期至：'
        Taborder: 3
        Taborder: 2
      ]
    }
    #child: pStockingPoint
    #child: pnlContent661
    Component dhSelectStockingPoint
    {
      #keys: '[414996.1.206961950]'
      BaseType: 'WebDataHolder'
      Databinding: 'StockingPoint_MP'
      Properties:
      [
        Taborder: 1
      ]
    }
    #child: pProduct
  ]
  Properties:
  [