Merge branch 'feature_dev_20230103_KJJY' into dev_2nd_LCYH

# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
#	jero-web/src/components/CollectionType/index.vue
#	jero-web/src/components/CollectionTypeDisabled/index.vue
#	jero-web/src/components/tableCollection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

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

@@ -1100,12 +1100,12 @@ module.exports = {
   NDropdownradio: '下拉单选',
   NDropdownmultipleselection: '下拉多选',
   Nenclosure: '附件',
-  Atext: '文本+下拉单选',
-  Btext: '文本+下拉多选',
+  Atext: '下拉单选+文本',
+  Btext: '下拉多选+文本',
   Ctext: '文本+附件',
   Dtext: '下拉单选+附件',
   Etext: '下拉多选+附件',
-  Ftext: '文本+下拉单选+附件',
+  Ftext: '下拉单选+文本+附件',
   Gtext: '标题',
   Nnothing: '无',
   Nchinese: '中文',