高嵩 4633d465f3 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

..

jero-boot-base-api

数据字典实现中英文切换

2022-04-15 15:41:37 +08:00

jero-boot-base-core

Merge branch 'dev_2nd_period_test' into fix_2nd_period

2022-12-28 09:53:38 +08:00

jero-boot-base-generater

认证-参数项收集-同步上报库

2022-05-18 18:13:01 +08:00

jero-boot-base-generater-core

代码初始化

2021-12-31 11:35:09 +08:00

jero-boot-base-tools

文档库--搜索(全部)

2022-03-18 16:40:38 +08:00

pom.xml

代码初始化

2021-12-31 11:35:09 +08:00