Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

# Conflicts:
#	nezha-fronted/package-lock.json
This commit is contained in:
zhangyu
2021-04-26 19:59:00 +08:00
32061 changed files with 769 additions and 1740 deletions

View File

@@ -717,8 +717,10 @@ const en = {
},
model: {
model: 'Asset model',
vendor: 'Vendor',
assets: 'Assets',
brand: 'Brand',
name: 'Asset model',
ChartTemplate: 'ChartTemplate',
assetNum: 'AssetNum',
editModel: 'Edit model',
createModel: 'Create model',
remark: 'Remark',