From d60f2ca80ddbe1846fb7ad9fd1f1e2fb01c372fe Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:20:27 +0800
Subject: [PATCH] 处理工单下发代码冲突
---
src/views/system/score/province/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/system/score/province/index.vue b/src/views/system/score/province/index.vue
index 45602dc..b1cb3d2 100644
--- a/src/views/system/score/province/index.vue
+++ b/src/views/system/score/province/index.vue
@@ -76,7 +76,7 @@
</template>
</el-table-column>
<el-table-column label="鍒嗗��" align="center" prop="score" />
- <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleCategory">
+ <el-table-column label="" align="center" prop="ruleCategory">
<template slot-scope="scope">
<div v-if="scope.row.ruleCategory == 1">瑙嗛鍦ㄧ嚎鐜�</div>
<div v-else-if="scope.row.ruleCategory == 2">瀛樺偍鏁呴殰</div>
--
Gitblit v1.8.0