Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
chenjinsong
2018-03-22 14:41:33 +08:00
79 changed files with 5111 additions and 2093 deletions

View File

@@ -11,7 +11,7 @@ officeManage=office management
userManage=user management
notify=my notify
help=help
home=home
home=Home
panel=my panel
userInfo=personal information
updatePwd=update password
@@ -95,6 +95,7 @@ log_search=log search
sysService_manage=system service manage
service_manage=service type manage
system_service_manage=system service type manage
specific_service_cfg=specific service cfg
#============menu end======================
#============yewu begin======================
@@ -172,6 +173,12 @@ has_approved=It has been approved and can not be operated on !
hasnot_approved=It has not been approved and can not be operated on !
check_one=choose one please !
one_more=please choose at least one !
custom_columns=custom columns
maxlength_64=The maxlength is 64\uff01
maxlength_128=The maxlength is 128\uff01
maxlength_256=The maxlength is 256\uff01
maxlength_512=The maxlength is 512\uff01
maxlength_4000=The maxlength is 4000\uff01
#==========message end=====================
#==========yewuliexingguanli begin=====================