Merge remote-tracking branch 'refs/remotes/origin/master' into feature/bfi-api-rate

# Conflicts:
#	pnpm-lock.yaml
#	src/axios.js
#	src/views/settlement/formal-settlement.vue
#	src/views/vehicle/customer-archive.vue

src/views/payment/receipt-flow.vue

@@ -271,6 +271,7 @@ import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/receiptFlow';
 import { receiptFlowTableColumns } from '@/option/payment/receiptFlow';
+import { isAdministrator } from '@/utils/auth';
 
 const emptyQuery = () => ({
   receiptNoticeNo: '',
@@ -312,10 +313,7 @@ export default {
   computed: {
     ...mapGetters(['permission', 'userInfo']),
     isAdmin() {
-      const authority = this.userInfo?.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
   },
   mounted() {