Merge branch 'dev_2nd_period' into 'feature_dev_20221010_extend'

# Conflicts:
#   jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue

jero-web/src/common/lang/zh-cn.js

@@ -195,8 +195,15 @@ module.exports = {
   OperationLog: '操作日志',
   SearchLog: '搜索日志',
   enterSearchKeyword: '请输入搜索关键词',
+  enterSearchContent:'请输入搜索内容',
+  enterStandard:'请输入编号',
+  entertitle:'请输入标题',
   OperationType: '操作类型',
   selectOperationType: '请选择操作类型',
+  selectProblemClassification:'请选择问题分类',
+  selectClassification:'请选择分类',
+  selectTranslationResults:'请选择翻译结果',
+  selectMarket:'请选择市场',
   RequestMethod: '请求方法',
   RequestParameters: '请求参数',
   logManagementPage: '这是日志管理页面',
@@ -1174,6 +1181,7 @@ module.exports = {
   exportComparisonReport: '导出对比报告',
   comparisonDifferenceComment: '对比差异评论',
   fullTextComments: '全文评论',
+  pleaseEnterfullTextComments:'请输入全文评论',
   fileDeclaration: '文件说明',
   FileForDetails: '文件详情',
   Converting: '转换中',
@@ -1322,6 +1330,7 @@ module.exports = {
   documentNumber: '文档编号',
   documentTitle: '文档标题',
   bringInDocumentInformation: '带入文档信息',
+  addStandardInformation:'添加标准信息',
   thereWhichCannotDeleted: '该标题下存在子标题无法进行删除',
   sdt: '工程接口人',
   dre: '填写人',