From 20b08e98cf8e12f884ae329a16fa9cef44e64f9e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 01 四月 2024 15:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 6defd05..13e9d0e 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -162,7 +162,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: (activity.creatorType==2? activity.companyName: "骞冲彴绔�")}}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
--
Gitblit v1.9.3