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

yypsybs

2023-09-20 30010fad767e42c851d8961cdea97a4444a756ae

 _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
      {