From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突

---
 src/components/view/b1-sample.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index e05bf0f..934eef7 100644
--- a/src/components/view/b1-sample.vue
+++ b/src/components/view/b1-sample.vue
@@ -153,7 +153,7 @@
 </style>
 
 <template>
-	<div class="inspection_order">
+	<div class="sample">
 		<div style="width: 100%;height: 100%;" v-if="!isDetail">
 			<div>
 				<el-row class="title">

--
Gitblit v1.9.3