From 9748f3f74f9f5d49d23528e9005bd82577591992 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 10 四月 2024 18:24:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/enterprise/selectSolutions.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/company/src/components/enterprise/selectSolutions.vue b/company/src/components/enterprise/selectSolutions.vue
index a3d6f1d..44cd09b 100644
--- a/company/src/components/enterprise/selectSolutions.vue
+++ b/company/src/components/enterprise/selectSolutions.vue
@@ -41,14 +41,14 @@
prop="worktypeName"
label="鎵�灞炲伐绉�">
</el-table-column>
-<!-- <el-table-column-->
-<!-- prop="startTime"-->
-<!-- label="淇濋櫓鐢熸晥璧锋湡">-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="endTime"-->
-<!-- label="淇濋櫓鐢熸晥姝㈡湡">-->
-<!-- </el-table-column>-->
+ <el-table-column
+ prop="startTime"
+ label="淇濋櫓鐢熸晥璧锋湡">
+ </el-table-column>
+ <el-table-column
+ prop="endTime"
+ label="淇濋櫓鐢熸晥姝㈡湡">
+ </el-table-column>
</el-table>
</GlobalWindow>
</template>
--
Gitblit v1.9.3