From b272fec78e30d1a10f3ab761684a119193391296 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 19 十一月 2024 17:08:57 +0800
Subject: [PATCH] 解决冲突

---
 app/config/config.yaml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/app/config/config.yaml b/app/config/config.yaml
index d260302..e1f16c5 100644
--- a/app/config/config.yaml
+++ b/app/config/config.yaml
@@ -12,4 +12,5 @@
 PRIVATE_KEY: str
 fetch_sgb_agent: 鎶ュ憡鐢熸垚,鏂囨。鏅鸿兘
 fetch_fwr_agent: 鐭ヨ瘑闂瓟,鏅鸿兘闂瓟
-PASSWORD_KEY: VKinqB-8XMrwCLLrcf_PyHyo12_4PVKvWzaHjNFions=
\ No newline at end of file
+PASSWORD_KEY: VKinqB-8XMrwCLLrcf_PyHyo12_4PVKvWzaHjNFions=
+basic_base_url: http://192.168.20.231:8000

--
Gitblit v1.8.0