From 6b474dc54cae5d6c8a06dd72c2462faaaeb5fe42 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 29 Aug 2024 14:26:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jys7-15' into jys7-15

---
 .idea/misc.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5cd614..911d29d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">

--
Gitblit v1.9.3