* 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen:
  1

# Conflicts:
#	doc/DB/compass_db_schema.sql
#	doc/DB/compass_db_schema.xlsx
#	doc/小程序文件命名以及接口调用说明.xlsx
#	doc/接口文档 V1.0.xls