# Conflicts: # jero-boot/db/蔚来标准sql/dev_2nd_period.sql # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js # jero-web/src/views/projectManagement/components/customizeList.vue # jero-web/src/views/projectManagement/components/listOfRegulations.vue