Merge branch 'main' of github.com:hainatravel/global-sales

# Conflicts:
#	src/stores/OrderStore.js

src/stores/OrderStore.js

@@ -1,6 +1,7 @@
 import { create } from 'zustand'
 import { fetchJSON } from '@/utils/request'
 import { API_HOST } from '@/config'
+import { isNotEmpty, prepareUrl } from '@/utils/commons'
 
 const useOrderStore = create((set, get) => ({