Merge branch 'master' into myhs

# Conflicts:
#	example/admin/init.go
#	example/bzyy.exe
#	example/main.go

code/makecode.go

@@ -688,6 +688,11 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 					hasUser = true
 				}
 
+				reqValue := req.FormValue(v.GetString("name"))
+				if reqValue != "" {
+					data[table+"."+v.GetString("name")] = reqValue
+				}
+
 			} else {
 				reStr += table + "." + v.GetString("name") + ","
 			}