From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin-web/src/utils/stockType.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/admin-web/src/utils/stockType.js b/admin-web/src/utils/stockType.js
index e721978..16a5eef 100644
--- a/admin-web/src/utils/stockType.js
+++ b/admin-web/src/utils/stockType.js
@@ -1,6 +1,6 @@
 function stockType(row) {
   let result = '';
-  let arr = ['閲囪喘鍏ュ簱', '璋冩嫧', '鍏朵粬鍑哄簱', '閮ㄩ棬鍒嗗彂', '鎶ュ簾鍑哄簱', '閮ㄩ棬鐗╁搧鍥為��浠撳簱', '鐗╁搧鐩樼偣'];
+  let arr = ['閲囪喘鍏ュ簱', '璋冩嫧', '鍏朵粬鍑哄簱', '閮ㄩ棬鍒嗗彂', '鎶ュ簾鍑哄簱', '鐗╁搧閫�鍥�', '鐗╁搧鐩樼偣'];
   if (row.businessType == 7) {
     if (row.thisType == 1) {
       result = '鐩樼泩鍏ュ簱';

--
Gitblit v1.9.1