Merge branch 'dev' of http://119.23.72.7/mushishixian/search_server into dev

# Conflicts:
#	pkg/gredis/redis.go

pkg/gredis/redis.go

@@ -32,6 +32,7 @@ func Setup() (err error) {
 	return nil
 }
 
+//格式化成字符串
 func String( a interface{},err error) (string,error) {
 	return redis.String(a,err)
 }