chenlu
2025-06-16 6c87198b8bcd6cdf630550334477e3bd9102645a
Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

# Conflicts:
# north-glass-erp/northglass-erp/src/lang/kr.js
1个文件已修改
8 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/lang/kr.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/kr.js
@@ -14,7 +14,7 @@
    main:{
        connectErr:'서버 연결이 원활하지 않습니다. 잠시 후 다시 시도해 주세요.',
        titleFirst:"환영합니다 ",
        titleLast:' 북베이 ERP 시스템에 오신 것을 환영합니다.'
        titleLast:' NorthGlass ERP 시스템에 오신 것을 환영합니다.'
    },
    error:{
        Code_401:'현재 사용자에게 해당 권한이 없습니다.',
@@ -506,13 +506,13 @@
        quantityMax:"最大数量",
        shortestLongest:"短边最大(mm)",
        shortestSide:"短边最短(mm)",
        intelligentBranching:"智能分架",
        reset:"重置",
        intelligentBranching:"지능형 분리",
        reset:"재설정",
        combinedFrame:"허 대",
        shelfNumber:'대 호',
        totalSequenceNumber:'총번호',
        cancelMerger:'합병 취소',
        projectMse1:'请选择工程对应的版图号',
        projectMse1:' ',
        orderPrint:'주문서 인쇄',
        numberLabelPrintingOperations:'라벨 인쇄 횟수',
        numberTimesProcessCardPrinted:'프로세스 카드 인쇄 횟수',