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

This commit is contained in:
zhangshilin
2018-03-28 13:06:09 +08:00
12 changed files with 224 additions and 119 deletions

View File

@@ -19,6 +19,7 @@ show=show
edit=edit
hi=hi
exit=exit
choose=choose
#============menu begin======================
requestInfo=requestInfo
@@ -40,15 +41,12 @@ sip_ip_control=sip ip control
domain_control_white=domain control white
ip_address_control=ip address control
ip_control=ip control
ip_port_control=ip port control
domain_control=domain control
dns_control=dns control
basic_configuration=basic configuration
letter_from=letter from
classification_manage=classification manage
attribute_manage=attribute manage
area_manage=area manage
isp_manage=isp manage
feature_scope_manage=feature scope manage
special_tasks=special tasks
label_manage=label manage
@@ -94,12 +92,9 @@ 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
features_area=features area
attribute_manage=attribute manage
isp_manage=isp manage
feature_scope_manage=feature scope manage
plaintext_manage=plaintext manage
ip_multiple_control=ip multiple control
ip_port_control=ip port control
website_multiple_control=website multiple control