Merge remote-tracking branch 'origin/coffee_jiuye' into lon_students_merge_code_test

# Conflicts: # .idea/.gitignore # stu_jiuye/database.py # stu_jiuye/main.py
2026-09-22 13:22:52 +08:00
parent 4e929295e3 2cc3829c88
commit ee548328d5
5 changed files with 113 additions and 88 deletions
@@ -1,10 +1,12 @@
 # 默认忽略的文件
 /shelf/
 /workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
 # 已忽略包含查询文件的默认文件夹
 /queries/
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
+*.xml
+*.iml