merge: main 브랜치의 최신 변경 사항 병합 및 충돌 해결

This commit is contained in:
thlee3 committed 2026-04-17 15:37:57 +09:00
commit 6053c746a3
50 files changed
+8265 -1187

No files matched your search

+13
View File
@@ -0,0 +1,13 @@
[
{
"법인": "(주)회사1",
"자산코드": "ASSET-100",
"명칭": "서버 모델A",
"위치": "본사 1층",
"관리자": "관리자A",
"IP주소": "192.168.0.1",
"MACaddress": "00:00:00:00:00:01",
"HW사양": "Core i7, 16GB RAM",
"OS": "Windows 10"
}
]