Merge branch 'feature_dev_20230105_ZDYBT'

# 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
2023-02-11 22:10:12 +08:00
parent 5ad54639e1 1ed4250bc0
commit b43cc4a60f
14 changed files with 1364 additions and 238 deletions
@@ -1378,4 +1378,5 @@ module.exports = {
  columnforced:'Confirm a forced retraction?',
  customize:'Customize the header',
  customColumn:'Custom column',
+
 }