Merge remote-tracking branch 'origin/master'

# Conflicts: # jero-web/src/common/lang/en-us.js
2022-04-20 15:53:21 +08:00
parent 3009d3a723 4753586616
commit f613379341
4 changed files with 61 additions and 22 deletions
@@ -696,4 +696,5 @@ module.exports = {
  historicalVersion:'历史版本',
  versionName:'版本名称',
  finalizationTime:'定版时间',
+  setting:'设定',
 }