From b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:51 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
index 2431bfa..5f771fc 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
@@ -401,7 +401,11 @@
},
handleSuccess(res, file, filelist) {
+<<<<<<< HEAD
+ console.log(res);
+=======
console.log(res)
+>>>>>>> 948cca39e334dde8a3ef04c030f8d691edf30bf8
const baseUrl = 'http://140.143.152.226:8410/';
this.ill.positive = baseUrl + res.data.url1;
--
Gitblit v1.8.0