解决冲突 提交本地

This commit is contained in:
zhangshilin
2018-03-17 17:09:19 +08:00
parent b96389e37f
commit d5a2a32c51
25 changed files with 2737 additions and 8 deletions

View File

@@ -62,7 +62,7 @@ website_keyword_control=\u7f51\u9875\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7
mail_control=\u90ae\u4ef6\u7ba1\u63a7
recipient_control=\u6536\u4ef6\u4eba\u7ba1\u63a7
sender_control=\u53d1\u4ef6\u4eba\u7ba1\u63a7
theme_control=\u4e3b\u9898\u7ba1\u63a7
subject_control=\u4e3b\u9898\u7ba1\u63a7
mail_keyword_control=\u90ae\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7
mail_attachment_name_control=\u90ae\u4ef6\u9644\u4ef6\u540d\u5173\u952e\u5b57\u7ba1\u63a7
mail_attachment_content_control=\u90ae\u4ef6\u9644\u4ef6\u5185\u5bb9\u5173\u952e\u5b57\u7ba1\u63a7
@@ -95,6 +95,8 @@ 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
specific_service_host_cfg=\u7279\u5b9a\u670d\u52a1\u670d\u52a1\u5668IP\u7ba1\u7406
#==========menu end=====================
#==========yewu zidian begin=====================
@@ -106,7 +108,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 +173,7 @@ 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
#==========message end=====================
#==========yewuliexingguanli begin=====================