Merge remote-tracking branch 'origin/dev_PersonChange_20230712'

# Conflicts:
#	jero-web/src/views/projectManagement/components/listEditModel.vue
This commit is contained in:
高嵩
2023-07-14 18:06:53 +08:00
17 changed files with 1963 additions and 668 deletions
+4
View File
@@ -1905,4 +1905,8 @@ module.exports = {
knowledgeSharingHaveBeenStored:'Knowledge Sharing have been stored',
regulationMonthlyReportHaveBeenStored:'Regulation Monthly Report have been stored',
sendBackOne:'Return',
globalReplacement:'Global Replacement',
replacedPerson:'Replaced person',
replacementPerson:'Replacement Person',
thereReplaceableData:'There is currently no replaceable data',
}
+4
View File
@@ -3861,4 +3861,8 @@ module.exports = {
Notitleincluded:'不包含标题',
backToHomePage:'返回主页',
sendBackOne:'退回',
globalReplacement:'全局替换',
replacedPerson:'被替换人',
replacementPerson:'替换人',
thereReplaceableData:'当前没有可替换的数据',
}
File diff suppressed because it is too large Load Diff