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

hongji.li

2023-09-26 adb1e2a3ceae2acbe7f9ef6d6e3db5c1f982a763

 _Main/UI/MacroPlannerWebApp/Component_FormOrderLock/_ROOT_Component_FormOrderLock.def

@@ -45,6 +45,17 @@
        Taborder: 2
      ]
    }
    Component DataHolderOrderLockCheckedOrder
    {
      #keys: '[412960.0.245361440]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[CustomerOrder]*'
      Properties:
      [
        Description: '储存选中的订单数据'
        Taborder: 3
      ]
    }
  ]
  Properties:
  [