Resolve conflict

2026-08-19 04:23:55 +00:00 · 2021-05-12 17:04:51 +08:00
parent 97bd0f9488 f1f929498a
commit 55717afc14
2 changed files with 3 additions and 0 deletions
@@ -122,5 +122,6 @@ class MergeBookingLogic extends AbstractControllerLogic
        } catch (\Exception $exception) {
            throw new ErrorException($exception->getMessage(), $exception->getCode());
        }
+
    }
 }
@@ -1,6 +1,7 @@
 <template>
    <div class="row m-b-10 parentContainer">
        <div class="col">
+
            <div class="row align-items-center">
                <div class="col p-t-5 p-b-5">
                    <div class="col text-center">
@@ -47,6 +48,7 @@
        },
        methods: {
            mergeTransfer(){
+
                this.$root.$emit('setLoading', true);

                let bookings=[];