Commit c590503e authored by Eddie.Wu's avatar Eddie.Wu

Merge branch 'dev_mysql_chase' into 'dev_mysql'

fix bug

See merge request root/atms!356
parents f9a7711a 862b5e7e
...@@ -316,6 +316,8 @@ ...@@ -316,6 +316,8 @@
"CannotDeleteAreaTips":"cannot delete the:{name} because of sub area exists!", "CannotDeleteAreaTips":"cannot delete the:{name} because of sub area exists!",
"ComfirmAreaIsActive":"Comfirm {isActiveStr} Area:{areaName}", "ComfirmAreaIsActive":"Comfirm {isActiveStr} Area:{areaName}",
"UnSave": "You need save first!", "addFileType": "add File Type",
"addFileType": "add File Type" "ExportTable": "Export Table",
"UnSave": "You need save first!"
} }
...@@ -404,5 +404,6 @@ ...@@ -404,5 +404,6 @@
"notAllowDisableMessage": "机构中已关联,不允许停用", "notAllowDisableMessage": "机构中已关联,不允许停用",
"UnSave": "未点击保存按钮!", "UnSave": "未点击保存按钮!",
"addFileType": "新建档案类型", "addFileType": "新建档案类型",
"ExportTable": "导出列表",
"~MustBeEndOneApp": "I Must be the End One, please!" "~MustBeEndOneApp": "I Must be the End One, please!"
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment