From 7dfae8e6376ab235c0d560dc998acda39a7c28b9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 10 七月 2025 13:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/inventoryManagement/stockManagement/index.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 6356d7a..86f1a76 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -140,7 +140,7 @@
 import { ref } from 'vue'
 import { ElMessageBox } from "element-plus";
 import useUserStore from '@/store/modules/user'
-import { userListNoPage } from "@/api/system/user.js";
+import { userListNoPageByTenantId } from "@/api/system/user.js";
 import { productTreeList,modelList } from "@/api/basicData/product.js"
 import {
   getStockManagePage ,
@@ -257,7 +257,7 @@
   operationType.value = type
   form.value = {}
   productData.value = []
-  let userLists = await userListNoPage()
+  let userLists = await userListNoPageByTenantId()
   userList.value = userLists.data
   // customerList().then(res => {
   //   customerOption.value = res

--
Gitblit v1.9.3