From 937e0e7a3c06aea55d42350268c1aba8e3264eb3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 24 七月 2026 14:16:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
.idea/encodings.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index b0029eb..e9b8913 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -39,6 +39,8 @@
<file url="file://$PROJECT_DIR$/ruoyi-system/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ruoyi-system/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/common/DeepSeekApi.java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/common/DeepSeekApi.java" charset="GBK" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/PatMedOuthospProvisional.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceSubtaskPreachform.java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/mapper/PatMedOuthospProvisionalMapper.java" charset="UTF-8" />
@@ -54,4 +56,4 @@
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
<file url="PROJECT" charset="GBK" />
</component>
-</project>
+</project>
\ No newline at end of file
--
Gitblit v1.9.3