chore: 🔨 合并冲突解决

2024-11-16 23:00:30 +08:00
parent 2dd4421fdf
commit 711e3ba5f4
48 changed files with 207 additions and 791 deletions
--- a/src/views/demo/curd/config/content2.ts
+++ b/src/views/demo/curd/config/content2.ts
@@ -15,8 +15,7 @@ const contentConfig: IContentConfig = {
        {
          id: 1,
          username: "tom",
-          avatar:
-            "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
          percent: 99,
          price: 10,
          url: "https://www.baidu.com",
@@ -30,8 +29,7 @@ const contentConfig: IContentConfig = {
        {
          id: 2,
          username: "jerry",
-          avatar:
-            "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
          percent: 88,
          price: 999,
          url: "https://www.google.com",