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/en-us.js

@@ -1088,12 +1088,12 @@ module.exports = {
   NDropdownradio: 'Pull single',
   NDropdownmultipleselection: 'Pull more',
   Nenclosure: 'File',
-  Atext: 'Text+Pull single',
-  Btext: 'Text+Pull more',
+  Atext: 'Pull single+Text',
+  Btext: 'Pull more+Text',
   Ctext: 'Text+File',
   Dtext: 'Pull single+File',
   Etext: 'Pull more+File',
-  Ftext: 'Text+Pull single+File',
+  Ftext: 'Pull single+Text+File',
   Gtext: 'Title',
   Nnothing: 'Null',
   Nchinese: 'Chinese',