Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-ui/src/lang/zh.js
This commit is contained in:
lsymicc
2025-06-10 17:35:03 +08:00
14 changed files with 3319 additions and 46 deletions

View File

@@ -626,6 +626,23 @@ export default {
},
viewsMain: {
title: 'homePage',
unfinishedInboundTask: 'Unfinished Inbound Task Overview',
taskKey: 'Task Key',
unfinishedInboundTaskName: 'Unfinished Inbound Task',
totalUnfinishedCount: 'Total Unfinished Count',
todayUnfinishedCount: 'Today Unfinished Count',
finishedInboundTask: 'Finished Inbound Task Overview',
finishedInboundTaskName: 'Finished Inbound Task',
totalFinishedCount: 'Total Finished Count',
todayFinishedCount: 'Today Finished Count',
unfinishedOutboundTask: 'Unfinished Outbound Task Overview',
unfinishedOutboundTaskName: 'Unfinished Outbound Task',
finishedOutboundTask: 'Finished Outbound Task Overview',
finishedOutboundTaskName: 'Finished Outbound Task'
},
searchViewStockSecure: {
stockId: 'Stock ID',
cargoSpaceId: 'Cargo Space ID',