diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b4604fce..ad541004 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,11 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8a61ce26-c938-4ad4-aa09-565c63cde7d7" name="更改" comment="">
-<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-=======
-      <change beforePath="$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java" beforeDir="false" afterPath="$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java" afterDir="false" />
->>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
+      <change beforePath="$PROJECT_DIR$/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -29,20 +26,18 @@
     <option name="importingSettings">
       <MavenImportingSettings>
         <option name="vmOptionsForImporter" value="-Xms1024m -Xmx2048m" />
-        <option name="workspaceImportForciblyTurnedOn" value="true" />
       </MavenImportingSettings>
     </option>
   </component>
   <component name="ProjectColorInfo">{
-  &quot;customColor&quot;: &quot;&quot;,
-  &quot;associatedIndex&quot;: 4
-}</component>
+    &quot;customColor&quot;: &quot;&quot;,
+    &quot;associatedIndex&quot;: 4
+    }</component>
   <component name="ProjectId" id="2mbKcle5CV9u33bCPQuGNY1YxDQ" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-<<<<<<< HEAD
   <component name="PropertiesComponent">{
   &quot;keyToString&quot;: {
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
@@ -58,32 +53,12 @@
     &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
     &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.importing&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;,
-    &quot;应用程序.GwApplication.executor&quot;: &quot;Run&quot;
+    &quot;应用程序.BaseApplication.executor&quot;: &quot;Debug&quot;,
+    &quot;应用程序.GwApplication.executor&quot;: &quot;Debug&quot;,
+    &quot;应用程序.ResApplication.executor&quot;: &quot;Debug&quot;
   }
 }</component>
-  <component name="RunManager" selected="应用程序.Publish">
-=======
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "main",
-    "kotlin-language-version-configured": "true",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "模块",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "vue.rearranger.settings.migration": "true",
-    "应用程序.BaseApplication.executor": "Run",
-    "应用程序.GwApplication.executor": "Run",
-    "应用程序.ResApplication.executor": "Run"
-  }
-}]]></component>
-  <component name="RunManager" selected="应用程序.BaseApplication">
+  <component name="RunManager" selected="应用程序.ResApplication">
     <configuration name="BaseApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.base.BaseApplication" />
       <module name="dsBase" />
@@ -97,7 +72,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
->>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
     <configuration name="GwApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.gw.GwApplication" />
       <module name="dsGw" />
@@ -111,11 +85,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-<<<<<<< HEAD
-    <configuration name="Publish" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Publish" />
-      <module name="dsBuild" />
-=======
     <configuration name="ResApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.dsideal.resource.ResApplication" />
       <module name="dsRes" />
@@ -125,28 +94,23 @@
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
->>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <recent_temporary>
       <list>
-<<<<<<< HEAD
-        <item itemvalue="应用程序.Publish" />
-=======
+        <item itemvalue="应用程序.ResApplication" />
         <item itemvalue="应用程序.BaseApplication" />
->>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
         <item itemvalue="应用程序.GwApplication" />
-        <item itemvalue="应用程序.ResApplication" />
       </list>
     </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17011.79" />
-        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17011.79" />
+        <option value="bundled-jdk-9823dce3aa75-b114ca120d71-intellij.indexing.shared.core-IU-242.21829.142" />
+        <option value="bundled-js-predefined-d6986cc7102b-7c0b70fcd90d-JavaScript-IU-242.21829.142" />
       </set>
     </attachedChunks>
   </component>
@@ -159,12 +123,7 @@
       <option name="presentableId" value="Default" />
       <updated>1727339918298</updated>
       <workItem from="1727339920435" duration="293000" />
-<<<<<<< HEAD
-      <workItem from="1727340224328" duration="5888000" />
-=======
       <workItem from="1727340224328" duration="3509000" />
-      <workItem from="1727399806173" duration="1616000" />
->>>>>>> 5521982ae4d5e06a3e69ee4c8fe13fa6e869ef95
     </task>
     <servers />
   </component>
@@ -177,4 +136,15 @@
     <option featureType="dependencySupport" implementationName="java:org.projectlombok:lombok" />
     <option featureType="dependencySupport" implementationName="java:org.wiremock:wiremock" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java</url>
+          <line>38</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>
\ No newline at end of file