kjs
/
ERP-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lhj #137

Merged
hjlee merged 7 commits from lhj into main 2025-10-23 15:17:15 +09:00
Conversation 0 Commits 7 Files Changed 21 +4807 -54
hjlee commented 2025-10-23 15:17:08 +09:00
Collaborator
Copy Link

지도에 날씨 특보 위치 보이고 todo긴급위젯이랑 정비일정위젯 합쳤습니다.

지도에 날씨 특보 위치 보이고 todo긴급위젯이랑 정비일정위젯 합쳤습니다.
hjlee self-assigned this 2025-10-23 15:17:08 +09:00
hjlee added 7 commits 2025-10-23 15:17:09 +09:00
753c170839 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj 
; Please enter a commit message to explain why this merge is necessary,
; especially if it merges an updated upstream into a topic branch.
;
; Lines starting with ';' will be ignored, and an empty message aborts
; the commit.
ec1669d9ca Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj 
; Please enter a commit message to explain why this merge is necessary,
; especially if it merges an updated upstream into a topic branch.
;
; Lines starting with ';' will be ignored, and an empty message aborts
; the commit.
6a5cf839a7 Merge branch 'main' into lhj 
충돌 해결:
- CanvasElement.tsx: CustomMetricWidget(main) + 통합 TaskWidget(lhj) 모두 유지
- DashboardTopMenu.tsx: lhj의 '일정관리 위젯' 유지
- DashboardSidebar.tsx: main의 삭제 수락
hjlee merged commit b3afd923c9 into main 2025-10-23 15:17:15 +09:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
hjlee
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: kjs/ERP-node#137
No description provided.
Delete Branch "lhj"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?