Merge branch 'dev'

renhao

2023-10-13 f3dec8f5b480474c9a3b2ea0fabb0f6b9fdc0423

 _Main/BL/EDI/Broker_Broker_OTD_BaseConversionFactor.qbl

@@ -34,10 +34,6 @@
      OthersMayFlushTable: true
      OthersMayInsertRow: true
      Parameters: '/owner="YUXTEST"'
      PrimaryKeyColumns: ISENABLED
      PrimaryKeyColumns: PRODUCTID
      PrimaryKeyColumns: SOURCEUNITOFMEASURENAME
      PrimaryKeyColumns: TARGETUNITOFMEASURENAME
      RecordModificationHintStrategy: 'None'
      EDIODBCLinkColumn FACTOR
      {