Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/wallet/wallet-qb/index.vue

@@ -124,7 +124,7 @@
 
 <script setup lang="ts" name="systemWalletManage">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchListJoin, delObjs } from "/@/api/wallet/wallet-manage"
+import { fetchListJoinQb, delObjs } from "/@/api/wallet/wallet-manage"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
@@ -144,7 +144,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
 		walletRecordMonth: formatDate(new Date(), "YYYY-mm"),
 	},
-	pageList: fetchListJoin,
+	pageList: fetchListJoinQb,
 })
 
 //  table hook