From f625139d2c5e192c88ba23a58284da449161ceb8 Mon Sep 17 00:00:00 2001
From: jinsir <874871581@qq.com>
Date: Sun, 23 Feb 2025 20:36:49 +0800
Subject: [PATCH 1/4]   223

---
 .../src/models/goods/goods.controller.ts      | 23 +++----------------
 apps/server/src/models/goods/goods.module.ts  | 12 +---------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/apps/server/src/models/goods/goods.controller.ts b/apps/server/src/models/goods/goods.controller.ts
index f0bc95c..7c9cf18 100644
--- a/apps/server/src/models/goods/goods.controller.ts
+++ b/apps/server/src/models/goods/goods.controller.ts
@@ -16,30 +16,13 @@ export class GoodsController {
     }
 
     // 示例2：路径参数
-    @Get('detail/:id')
-    getDetail(@Param('id') id: string) {
-        return {
-            id: id,
-            detail: `Detail for product ${id}`
-        };
-    }
-
-    // 示例3：多个查询参数
-    @Get('search')
-    searchProducts(
-        @Query('keyword') keyword: string,
-        @Query('page') page: number = 1,
-        @Query('limit') limit: number = 10
-    ) {
-        return {
+    @Get('detail/:id')<<<<<<< HEAD
             keyword,
             page,
             limit,
             results: []
         };
     }
-<<<<<<< HEAD
+
 }
-=======
-}
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
+
diff --git a/apps/server/src/models/goods/goods.module.ts b/apps/server/src/models/goods/goods.module.ts
index 3439841..8b9b8e1 100644
--- a/apps/server/src/models/goods/goods.module.ts
+++ b/apps/server/src/models/goods/goods.module.ts
@@ -3,18 +3,8 @@ import { GoodsService } from './goods.service';
 import { GoodsController } from './goods.controller';
 
 @Module({
-<<<<<<< HEAD
-
-    providers: [GoodsService],
-    controllers:[GoodsController]
-
-
-})
-
-export class GoodsModule {}
-=======
   providers: [GoodsService],
   controllers: [GoodsController],
 })
 export class GoodsModule {}
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
+

From 7d06aafe870061cca64fb587271f24a5d6e48289 Mon Sep 17 00:00:00 2001
From: linguoqing <2499342078@qq.com>
Date: Sun, 23 Feb 2025 20:37:38 +0800
Subject: [PATCH 2/4] 2025.02.23

---
 apps/web/src/app/main/home/page.tsx | 56 -----------------------------
 1 file changed, 56 deletions(-)

diff --git a/apps/web/src/app/main/home/page.tsx b/apps/web/src/app/main/home/page.tsx
index 74836b4..878e55c 100755
--- a/apps/web/src/app/main/home/page.tsx
+++ b/apps/web/src/app/main/home/page.tsx
@@ -1,58 +1,3 @@
-<<<<<<< HEAD
-import { api } from "@nice/client";
-import { apiClient } from "@web/src/utils";
-
-import { Button, Tag } from "antd";
-
-import { useEffect, useMemo, useState } from "react";
-function HomePage() {
-    // 使用 useQuery 钩子从 API 获取数据
-
-    const { data } = api.staff.findMany.useQuery({
-        take: 10
-    });
-
-    // 定义 counter 状态和更新函数
-    const [counter, setCounter] = useState<number>(0);
-
-    // 使用 useMemo 记忆化 counterText，仅在 counter 变化时重新计算
-    const counterText = useMemo(() => {
-        return `当前计数为: ${counter}`;
-    }, [counter]);
-
-    const getData = async()=>{
-        const res = @wait apiClient.get(*/goods/hello*)
-        console.log(res)
-    }
-
-    // 使用 useEffect 在 data 变化时打印 data
-    useEffect(() => {
-        apiClient.get(“/goods/hello”)
-    }, [data]);
-
-    return (
-        <div className="p-2 space-y-2">
-            <Tag>{counterText}</Tag>
-            <div className="space-x-2">
-                <Button type="primary" onClick={() => setCounter(counter + 1)}>
-                    加1
-                </Button>
-                <Button danger onClick={() => setCounter(counter - 1)}>
-                    减1
-                </Button>
-            </div>
-            {/* 如果 data 存在，遍历并渲染每个项目的 username */}
-            {data?.map((item) => (
-                <div className="p-2 rounded border shadow" key={item.username}>
-                    <Tag>{item.username}</Tag>
-                </div>
-            ))}
-        </div>
-    );
-}
-
-export default HomePage;
-=======
 import { api } from "@nice/client"
 import { apiClient } from "@web/src/utils"
 import { Button, Tag } from "antd"
@@ -98,4 +43,3 @@ function HomePage() {
 }
 // export { HomePage }
 export default HomePage
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276

From 9036579ff8230dd0d799cff5c52126af438d2fea Mon Sep 17 00:00:00 2001
From: jinsir <874871581@qq.com>
Date: Sun, 23 Feb 2025 20:38:12 +0800
Subject: [PATCH 3/4]   223

---
 apps/server/src/models/goods/goods.controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/models/goods/goods.controller.ts b/apps/server/src/models/goods/goods.controller.ts
index 7c9cf18..cf80925 100644
--- a/apps/server/src/models/goods/goods.controller.ts
+++ b/apps/server/src/models/goods/goods.controller.ts
@@ -16,7 +16,7 @@ export class GoodsController {
     }
 
     // 示例2：路径参数
-    @Get('detail/:id')<<<<<<< HEAD
+    @Get('detail/:id')
             keyword,
             page,
             limit,

From ebd908bb7adda950e68d3c9ebc9dc77b6378a6fe Mon Sep 17 00:00:00 2001
From: longdayi <13477510+longdayilongdayi@user.noreply.gitee.com>
Date: Sun, 23 Feb 2025 20:39:48 +0800
Subject: [PATCH 4/4] 02232039

---
 apps/server/src/models/goods/goods.module.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/apps/server/src/models/goods/goods.module.ts b/apps/server/src/models/goods/goods.module.ts
index 3439841..7605654 100644
--- a/apps/server/src/models/goods/goods.module.ts
+++ b/apps/server/src/models/goods/goods.module.ts
@@ -3,18 +3,8 @@ import { GoodsService } from './goods.service';
 import { GoodsController } from './goods.controller';
 
 @Module({
-<<<<<<< HEAD
-
     providers: [GoodsService],
     controllers:[GoodsController]
-
-
 })
 
 export class GoodsModule {}
-=======
-  providers: [GoodsService],
-  controllers: [GoodsController],
-})
-export class GoodsModule {}
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276