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

This commit is contained in:
chiguangxu
2018-04-13 18:16:03 +08:00
39 changed files with 1266 additions and 1492 deletions

View File

@@ -335,4 +335,7 @@ protocol_desc=protocol description
#==========tedingfuwu end=====================
#===============multiole cfg start====================
optional=optional
#===============multiole cfg end====================
custom_region=custom region
please_input=please input
area_control_type=area control type
#===============multiole cfg end====================