From 0b46902b9a7e2a1357e5f6b46edbe3366cb8f785 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 01 九月 2025 16:17:07 +0800
Subject: [PATCH] Merge branch 'dev_huangjin' into dev

---
 src/main.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main.js b/src/main.js
index 014954c..ef6b2a4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,6 +22,7 @@
 import "virtual:svg-icons-register";
 import SvgIcon from "@/components/SvgIcon";
 import elementIcons from "@/components/SvgIcon/svgicon";
+import "./assets/fonts/font.css";
 
 import "./permission"; // permission control
 
@@ -75,7 +76,7 @@
 app.config.globalProperties.addDateRange = addDateRange;
 app.config.globalProperties.selectDictLabel = selectDictLabel;
 app.config.globalProperties.selectDictLabels = selectDictLabels;
-app.config.globalProperties.javaApi = "http://114.132.189.42:8099";
+app.config.globalProperties.javaApi = "http://114.132.189.42:7004";
 app.config.globalProperties.HaveJson = (val) => {
   return JSON.parse(JSON.stringify(val));
 };

--
Gitblit v1.9.3