From d9731d03b16034fe36f91a5ccfa3eb2061e4d244 Mon Sep 17 00:00:00 2001
From: chpark <chpark@gdnsi.com>
Date: Fri, 3 Jan 2025 09:56:39 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=BB=A4=EB=B0=8B=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
plm-api/src/controllers/app/common/product.controller.js | 5 -----
plm-api/src/services/product.service.js | 4 ----
plm-app/src/app/page.tsx | 2 +-
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/plm-api/src/controllers/app/common/product.controller.js b/plm-api/src/controllers/app/common/product.controller.js
index 0f2b3bf..fa0bbfb 100644
--- a/plm-api/src/controllers/app/common/product.controller.js
+++ b/plm-api/src/controllers/app/common/product.controller.js
@@ -46,12 +46,7 @@ router.put(
"/productUpdate/:id",
[
param("id").isUUID().withMessage("유효한 ID가 필요합니다"),
-<<<<<<< HEAD
body("product_name").optional().notEmpty().withMessage("제품군 이름이 필요합니다."),
-=======
- body("product_code").optional().notEmpty().withMessage("제품 코드가 필요합니다."),
- body("product_name").optional().notEmpty().withMessage("제품 이름이 필요합니다."),
->>>>>>> 996616fc2324b66b3ae033eced43180612cac2bf
body("companyId").optional().isUUID().withMessage("유효한 회사 ID가 필요합니다"),
validate,
],
diff --git a/plm-api/src/services/product.service.js b/plm-api/src/services/product.service.js
index c751173..456958b 100644
--- a/plm-api/src/services/product.service.js
+++ b/plm-api/src/services/product.service.js
@@ -152,11 +152,7 @@ class productService {
await alertService.createAlert({
type: "info",
-<<<<<<< HEAD
message: `제품 ${productName}이(가) ${currentUser.name}에 의해 삭제되었습니다.`,
-=======
- message: `제품군 ${productName}이(가) ${currentUser.name}에 의해 삭제되었습니다.`,
->>>>>>> 996616fc2324b66b3ae033eced43180612cac2bf
companyId: companyId,
});
diff --git a/plm-app/src/app/page.tsx b/plm-app/src/app/page.tsx
index 3636057..2391fe7 100644
--- a/plm-app/src/app/page.tsx
+++ b/plm-app/src/app/page.tsx
@@ -44,7 +44,7 @@ export default function Home() {
features: ["클린룸 에너지 관리", "유틸리티 최적화", "품질 연계 분석"],
},
];
-6ㅛ7ㅅ6 -
+
// 주요 기능 데이터
const features = [
{