From 8912e0696af069de47646fdb8a9d9c4e086e88b3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期日, 14 一月 2024 23:42:11 +0800
Subject: [PATCH] Resolve merge conflict

---
 web-pages/src/views/home/sstx.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/web-pages/src/views/home/sstx.vue b/web-pages/src/views/home/sstx.vue
index 01e4f53..3806032 100644
--- a/web-pages/src/views/home/sstx.vue
+++ b/web-pages/src/views/home/sstx.vue
@@ -148,7 +148,7 @@
                 {
                     icon: require('./assets/images/lxwj-zxty.png'),
                     title: '鍦ㄧ嚎浣撻獙',
-                    link: 'https://101.37.77.25:1336/static/index.html'
+                    link: 'https://www.funasr.com:1336/static/index.html'
                 },
                 {
                     icon: require('./assets/images/lxwj-az.png'),

--
Gitblit v1.9.1