From 9a11f818f304bc13bbd920313792e9560734922f Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:31:25 +0800
Subject: [PATCH] 合并冲突
---
src/views/fysp/config/components/evalution/CompEvalutionRuleUpd.vue | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/views/fysp/config/components/evalution/CompEvalutionRuleUpd.vue b/src/views/fysp/config/components/evalution/CompEvalutionRuleUpd.vue
index 1da7ece..d77cdba 100644
--- a/src/views/fysp/config/components/evalution/CompEvalutionRuleUpd.vue
+++ b/src/views/fysp/config/components/evalution/CompEvalutionRuleUpd.vue
@@ -62,7 +62,10 @@
import { enumScene } from '@/enum/scene';
import { ElMessage } from 'element-plus';
import evaluateApi from '@/api/fysp/evaluateApi';
+<<<<<<< HEAD
import { useCloned } from '@vueuse/core';
+=======
+>>>>>>> c06a5b40718062cc8b4b971322d7c394018cc972
export default {
props: {
readonly: {
--
Gitblit v1.9.3