From a6a1139ffea0d60ad8411a36411ab2deb781e64e Mon Sep 17 00:00:00 2001
From: none <none>
Date: Tue, 28 Mar 2023 14:12:59 +0800
Subject: [PATCH] resolove conflict

---
 src/pages/index/index.tsx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index 5d3d3b3..6569d7d 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -115,15 +115,18 @@ const IndexPage = () => {
           </div>
           <div className={styles["info"]}>
             <div className={styles["info-item"]}>
-              <span>必修课：已完成课时</span>
-              <strong> {stats.required_finished_hour_count || 0} </strong>
-              <span>/ {stats.required_hour_count || 0}</span>
+              <span>必修课：已完成</span>
+              <strong> {stats.required_finished_course_count || 0} </strong>
+              <span>/ {stats.required_course_count || 0}</span>
             </div>
             {stats.nun_required_hour_count > 0 && (
               <div className={styles["info-item"]}>
-                <span>选修课：已完成课时</span>
-                <strong> {stats.nun_required_finished_hour_count || 0} </strong>
-                <span>/ {stats.nun_required_hour_count || 0}</span>
+                <span>选修课：已完成</span>
+                <strong>
+                  {" "}
+                  {stats.nun_required_finished_course_count || 0}{" "}
+                </strong>
+                <span>/ {stats.required_finished_course_count || 0}</span>
               </div>
             )}
           </div>