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=\u673a\u6784\u7ba1\u7406
userManage=\u7528\u6237\u7ba1\u7406
notify=\u6211\u7684\u540c\u5fd7
help=\u5173\u4e8e\u5e2e\u52a9
home=\u5b98\u65b9\u9996\u9875
home=\u9996\u9875
panel=\u6211\u7684\u9762\u677f
userInfo=\u4e2a\u4eba\u4fe1\u606f
updatePwd=\u4fee\u6539\u5bc6\u7801
@@ -95,6 +95,7 @@ text_monitor=\u6587\u672c\u5e38\u89c4\u76d1\u6d4b
sysService_manage=\u7cfb\u7edf\u4e1a\u52a1\u7ba1\u7406
service_manage=\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
specific_service_cfg=\u7279\u5b9a\u670d\u52a1\u7ba1\u7406
#==========menu end=====================
#==========yewu zidian begin=====================
@@ -106,7 +107,7 @@ desc=\u63cf\u8ff0\u4fe1\u606f
parent_id=\u7236ID
is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9
is_valid=\u6709\u6548\u6807\u5fd7
create_time=\u914d\u7f6e\u65f6\u95f4
create_time=\u521b\u5efa\u65f6\u95f4
edit_time=\u4fee\u6539\u65f6\u95f4
superior_config=\u4e0a\u7ea7\u914d\u7f6e
config_content=\u914d\u7f6e\u5185\u5bb9
@@ -171,6 +172,12 @@ has_approved=\u5df2\u7ecf\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\
hasnot_approved=\u672a\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01
check_one=\u8bf7\u9009\u62e9\u4e00\u6761\u6570\u636e\uff01
one_more=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u6761\u6570\u636e!
custom_columns=\u81ea\u5b9a\u4e49\u5217\u5b57\u6bb5
maxlength_64=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f 64\u7684\u5b57\u7b26\u4e32\uff01
maxlength_128=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f 128\u7684\u5b57\u7b26\u4e32\uff01
maxlength_256=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f256\u7684\u5b57\u7b26\u4e32\uff01
maxlength_512=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f512\u7684\u5b57\u7b26\u4e32\uff01
maxlength_4000=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f4000\u7684\u5b57\u7b26\u4e32\uff01
#==========message end=====================
#==========yewuliexingguanli begin=====================