diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cc1bd0f..ca6f572 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1201acd7-f240-4a23-9c12-26bf9afcb8cb" name="更改" comment="初步框架" />
+    <list default="true" id="1201acd7-f240-4a23-9c12-26bf9afcb8cb" name="更改" comment="合并更改" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -38,10 +38,10 @@
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "customColor": "",
-  "associatedIndex": 1
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 1
+}</component>
   <component name="ProjectId" id="33pYNF2i3YjFfOgekWFVlM8sKGc" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -51,6 +51,7 @@
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "liwentao__branch",
     "kotlin-language-version-configured": "true",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
@@ -127,7 +128,15 @@
       <option name="project" value="LOCAL" />
       <updated>1760022602945</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="合并更改">
+      <option name="closed" value="true" />
+      <created>1760136750934</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1760136750934</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -159,6 +168,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="创建maven项目" />
     <MESSAGE value="初步框架" />
-    <option name="LAST_COMMIT_MESSAGE" value="初步框架" />
+    <MESSAGE value="合并更改" />
+    <option name="LAST_COMMIT_MESSAGE" value="合并更改" />
   </component>
 </project>
\ No newline at end of file
diff --git a/TestSystem.iml b/TestSystem.iml
index 376d00b..f5db840 100644
--- a/TestSystem.iml
+++ b/TestSystem.iml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_22">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.formdev:flatlaf:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: net.objecthunter:exp4j:0.4.8" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/target/classes/com/mathapp/MathApp.class b/target/classes/com/mathapp/MathApp.class
index 2706a1b..d391d0e 100644
Binary files a/target/classes/com/mathapp/MathApp.class and b/target/classes/com/mathapp/MathApp.class differ
diff --git a/target/classes/com/mathapp/models/User.class b/target/classes/com/mathapp/models/User.class
index d949610..201ff4e 100644
Binary files a/target/classes/com/mathapp/models/User.class and b/target/classes/com/mathapp/models/User.class differ
diff --git a/target/classes/com/mathapp/panels/ChangePasswordPanel.class b/target/classes/com/mathapp/panels/ChangePasswordPanel.class
index 06c929e..6a3135b 100644
Binary files a/target/classes/com/mathapp/panels/ChangePasswordPanel.class and b/target/classes/com/mathapp/panels/ChangePasswordPanel.class differ
diff --git a/target/classes/com/mathapp/panels/LoginPanel.class b/target/classes/com/mathapp/panels/LoginPanel.class
index be08574..fb7b90c 100644
Binary files a/target/classes/com/mathapp/panels/LoginPanel.class and b/target/classes/com/mathapp/panels/LoginPanel.class differ
diff --git a/target/classes/com/mathapp/panels/MainMenuPanel.class b/target/classes/com/mathapp/panels/MainMenuPanel.class
index f6a6d31..a7ada08 100644
Binary files a/target/classes/com/mathapp/panels/MainMenuPanel.class and b/target/classes/com/mathapp/panels/MainMenuPanel.class differ
diff --git a/target/classes/com/mathapp/panels/QuizPanel.class b/target/classes/com/mathapp/panels/QuizPanel.class
index 55aab6d..98c629f 100644
Binary files a/target/classes/com/mathapp/panels/QuizPanel.class and b/target/classes/com/mathapp/panels/QuizPanel.class differ
diff --git a/target/classes/com/mathapp/panels/RegisterPanel$1.class b/target/classes/com/mathapp/panels/RegisterPanel$1.class
index 242c9b5..93dd57c 100644
Binary files a/target/classes/com/mathapp/panels/RegisterPanel$1.class and b/target/classes/com/mathapp/panels/RegisterPanel$1.class differ
diff --git a/target/classes/com/mathapp/panels/RegisterPanel.class b/target/classes/com/mathapp/panels/RegisterPanel.class
index ac464d9..1a00b7e 100644
Binary files a/target/classes/com/mathapp/panels/RegisterPanel.class and b/target/classes/com/mathapp/panels/RegisterPanel.class differ
diff --git a/target/classes/com/mathapp/panels/ResultsPanel.class b/target/classes/com/mathapp/panels/ResultsPanel.class
index 1fe5236..e83f887 100644
Binary files a/target/classes/com/mathapp/panels/ResultsPanel.class and b/target/classes/com/mathapp/panels/ResultsPanel.class differ
diff --git a/target/classes/com/mathapp/panels/SetPasswordPanel.class b/target/classes/com/mathapp/panels/SetPasswordPanel.class
index 0dc7c20..bd6675d 100644
Binary files a/target/classes/com/mathapp/panels/SetPasswordPanel.class and b/target/classes/com/mathapp/panels/SetPasswordPanel.class differ
diff --git a/target/classes/com/mathapp/problemGenerators/AbstractProblemGenerator.class b/target/classes/com/mathapp/problemGenerators/AbstractProblemGenerator.class
index 3937b90..4497f7a 100644
Binary files a/target/classes/com/mathapp/problemGenerators/AbstractProblemGenerator.class and b/target/classes/com/mathapp/problemGenerators/AbstractProblemGenerator.class differ
diff --git a/target/classes/com/mathapp/problemGenerators/HighSchoolProblemGenerator.class b/target/classes/com/mathapp/problemGenerators/HighSchoolProblemGenerator.class
index ff0bf7f..e982df6 100644
Binary files a/target/classes/com/mathapp/problemGenerators/HighSchoolProblemGenerator.class and b/target/classes/com/mathapp/problemGenerators/HighSchoolProblemGenerator.class differ
diff --git a/target/classes/com/mathapp/problemGenerators/MiddleSchoolProblemGenerator.class b/target/classes/com/mathapp/problemGenerators/MiddleSchoolProblemGenerator.class
index 9c4db71..9dd9507 100644
Binary files a/target/classes/com/mathapp/problemGenerators/MiddleSchoolProblemGenerator.class and b/target/classes/com/mathapp/problemGenerators/MiddleSchoolProblemGenerator.class differ
diff --git a/target/classes/com/mathapp/services/DataPersistence.class b/target/classes/com/mathapp/services/DataPersistence.class
index 9f47185..4ab04a3 100644
Binary files a/target/classes/com/mathapp/services/DataPersistence.class and b/target/classes/com/mathapp/services/DataPersistence.class differ
diff --git a/target/classes/com/mathapp/services/EmailService$1.class b/target/classes/com/mathapp/services/EmailService$1.class
index f9d0faf..91f089c 100644
Binary files a/target/classes/com/mathapp/services/EmailService$1.class and b/target/classes/com/mathapp/services/EmailService$1.class differ
diff --git a/target/classes/com/mathapp/services/EmailService.class b/target/classes/com/mathapp/services/EmailService.class
index 96ac317..d27bfe7 100644
Binary files a/target/classes/com/mathapp/services/EmailService.class and b/target/classes/com/mathapp/services/EmailService.class differ