Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

# Conflicts: # jero-web/src/common/lang/zh-cn.js
2022-08-08 17:30:39 +08:00
parent 18bf986c06 ab4cc036d6
commit 2770973334
15 changed files with 848 additions and 110 deletions
@@ -1344,6 +1344,8 @@ module.exports = {
  turnOnAutoMatch:'打开自动匹配',
  Adjustareasofresponsibility:'调整责任领域',
  regulatoryTechnicalAssessment:'法规技术评估',
+  OpenOne:'公开',
+  Privacy:'私密',
  punctuationmark:'只能输入除#号和逗号外的英文标点符号',
  created: '创建时间',
  updated:'更新时间',