修复冲突

Signed-off-by: Bluemark <kongdy@bluemark.cn>
2023-12-07 02:01:57 +00:00
parent 16a4fd21b1 2164c91488
commit 6251ffa994
25 changed files with 789 additions and 433 deletions
@@ -110,7 +110,7 @@ const adaptTemplate = async (appTemplate) => {
    }
  }
  appTemplate.home = diyTemplate?.data?.home;
-  // appTemplate.user = diyTemplate?.data?.user;
+  appTemplate.user = diyTemplate?.data?.user;
 }

 export default app;