Merge branch develop into feature/增加一键合并下发功能，修正合并下发逻辑

sf_machine_connect/static/src/js/test.js

@@ -102,9 +102,6 @@ export class CodeField extends Component {
         this.orm = this.env.services.orm;
         this.record = this.props.record;
     }
-    // get domain() {
-    //     return this.props.record.getFieldDomain(this.props.name);
-
      async onBarcodeBtnClick() {
         // console.log(BarcodeScanner)
         const barcode = await BarcodeScanner.scanBarcode();
@@ -114,6 +111,7 @@ export class CodeField extends Component {
         if (barcode) {
             // console.log("存在")
             // alert('存在')
+
              await this.onBarcodeScanned(barcode);
             if ("vibrate" in browser.navigator) {
                 browser.navigator.vibrate(100);