Merge branch 'dev_2nd_period_test' into fix_2nd_period

# Conflicts: # jero-boot/db/蔚来标准sql/dev_2nd_period.sql # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java # jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js # jero-web/src/views/projectManagement/components/TaskList.vue # jero-web/src/views/projectManagement/components/listOfRegulations.vue
2022-12-28 09:53:38 +08:00
parent 34359f65a5 de7bfab8d1
commit 4633d465f3
81 changed files with 3221 additions and 154 deletions
@@ -1364,6 +1364,9 @@ module.exports = {
  relatedProjectVersion:'Related project version',
  Importfailure:'Import failure',
  CuiBan:'CuiBan',
+  brand:'Brand',
+  allsubitemsitem:'Whether to delete all subitems under this item',
+  contactTheFounder:'Contact the founder',
  certificationCategoryNumber: 'certification Category Number',
  historicalrecord:'historical Record',
  Referenceparametercolumn:'Reference Parameter Column',
@@ -1471,4 +1471,7 @@ module.exports = {
  Updateparametercolumn:'更新参数列',
  columnfirst:'请先引用参数列',
  columnforced:'确认强制撤回?',
+  brand:'品牌',
+  allsubitemsitem:'该项目下拥有子项目，是否全部删除',
+  contactTheFounder:'联系创建人',
 }