From 32d56327d6f69373ada1c3447f542ec1a39282b1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 17:31:01 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b2-standard-template.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index f69a83b..f4e7e35 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -196,7 +196,7 @@
}
}
data.data[0].celldata.forEach(a=>{
- if(a.v.ps!=undefined&&a.v.ps.value==='妫�楠屽��'){
+ if(a.v.ps!=undefined&&a.v.ps.value==='妫�楠屽��' || a.v.ps!=undefined&&a.v.ps.value==='璁惧鍚嶇О' || a.v.ps!=undefined&&a.v.ps.value==='璁惧缂栫爜'){
if(a.v.v === undefined){
a.v.v = ""
}
--
Gitblit v1.9.3