# Conflicts: # jero-boot/db/蔚来标准sql/dev_2nd_period.sql # jero-web/src/views/parameter/managementdetails/index.vue