From d8e9286b31459866723b0c33ce7e5823f175cadf Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Sun, 23 Feb 2025 20:35:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9D=8E=E9=81=A8=E8=BE=89test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/apps/server/src/models/goods/goods.controller.ts b/apps/server/src/models/goods/goods.controller.ts
index 806acd6..322add4 100644
--- a/apps/server/src/models/goods/goods.controller.ts
+++ b/apps/server/src/models/goods/goods.controller.ts
@@ -5,7 +5,6 @@ export class GoodsController {
     constructor() {
         console.log('goods controller')
     }
-
     // 示例1：基本查询参数
     @Get('hello')
     getHello(@Query('name') name?: string) {

From 0d1cdafccb34397a2af38fdbf3d2b39da1c2cba8 Mon Sep 17 00:00:00 2001
From: weiyida <2465069308@qq.com>
Date: Sun, 23 Feb 2025 20:35:55 +0800
Subject: [PATCH 2/3] 2035

---
 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 f5e52a61ff3e9c5f6b23d440e59d4b731493a39e Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Sun, 23 Feb 2025 20:37:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9D=8E=E9=81=A8=E8=BE=89test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/models/goods/goods.controller.ts      |  4 ----
 apps/server/src/models/goods/goods.service.ts | 23 +------------------
 apps/server/src/trpc/trpc.module.ts           |  4 ----
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/apps/server/src/models/goods/goods.controller.ts b/apps/server/src/models/goods/goods.controller.ts
index 2a4dbf0..322add4 100644
--- a/apps/server/src/models/goods/goods.controller.ts
+++ b/apps/server/src/models/goods/goods.controller.ts
@@ -37,8 +37,4 @@ export class GoodsController {
             results: []
         };
     }
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
diff --git a/apps/server/src/models/goods/goods.service.ts b/apps/server/src/models/goods/goods.service.ts
index 7288689..2e905b3 100644
--- a/apps/server/src/models/goods/goods.service.ts
+++ b/apps/server/src/models/goods/goods.service.ts
@@ -1,26 +1,5 @@
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 export class GoodsService {}
-=======
-<<<<<<< HEAD
-=======
->>>>>>> dc75314e36f86056790758574c3426f379c16a87
-export class GoodsService {}
-=======
-export class GoodsService {
-    
-}
-<<<<<<< HEAD
->>>>>>> 28132992c8dc4afaf9311d9ecd4ecd992e43e827
->>>>>>> 5a581fdda6e53f086e068357e1ce0cb6994ddbf2
-=======
-export class GoodsService {
-    
-}
-=======
->>>>>>> dc75314e36f86056790758574c3426f379c16a87
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
+
diff --git a/apps/server/src/trpc/trpc.module.ts b/apps/server/src/trpc/trpc.module.ts
index b07978d..ead8b11 100755
--- a/apps/server/src/trpc/trpc.module.ts
+++ b/apps/server/src/trpc/trpc.module.ts
@@ -34,11 +34,7 @@ import { GoodsModule } from '@server/models/goods/goods.module';
     VisitModule,
     WebSocketModule,
     ResourceModule,
-<<<<<<< HEAD
-    GoodsModule,
-=======
     GoodsModule
->>>>>>> de6e632ec69dd408a6c4e85d5cda01a1aa8e8276
   ],
   controllers: [],
   providers: [TrpcService, TrpcRouter, Logger],