Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
c590503e
Commit
c590503e
authored
May 06, 2019
by
Eddie.Wu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_mysql_chase' into 'dev_mysql'
fix bug See merge request root/atms!356
parents
f9a7711a
862b5e7e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
basicData.json
...b/src/main/webapp/app-resources/i18n/en-us/basicData.json
+4
-2
basicData.json
...b/src/main/webapp/app-resources/i18n/zh-CN/basicData.json
+2
-0
No files found.
atms-web/src/main/webapp/app-resources/i18n/en-us/basicData.json
View file @
c590503e
...
...
@@ -316,6 +316,8 @@
"CannotDeleteAreaTips"
:
"cannot delete the:{name} because of sub area exists!"
,
"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!"
}
atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json
View file @
c590503e
...
...
@@ -404,5 +404,6 @@
"notAllowDisableMessage"
:
"机构中已关联,不允许停用"
,
"UnSave"
:
"未点击保存按钮!"
,
"addFileType"
:
"新建档案类型"
,
"ExportTable"
:
"导出列表"
,
"~MustBeEndOneApp"
:
"I Must be the End One, please!"
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment