提交切分支

@@ -25,7 +25,7 @@ func (this *BaseController) Prepare() {
 	if this.Ctx.Input.Method() == "OPTIONS" {
 	if this.Ctx.Input.Method() == "OPTIONS" {
 		this.Ctx.ResponseWriter.WriteHeader(204)
 		this.Ctx.ResponseWriter.WriteHeader(204)
 		this.Ctx.ResponseWriter.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
 		this.Ctx.ResponseWriter.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
-		//this.Ctx.WriteString("")
+		this.Ctx.WriteString("")
 		return
 		return
 	}
 	}
 	p := this.Ctx.Input.GetData("RouterPattern")
 	p := this.Ctx.Input.GetData("RouterPattern")

@@ -62,4 +62,5 @@ type ResponseMeInfo struct {
 type MeCompany struct {
 type MeCompany struct {
 	Id   int64  `json:"id"`
 	Id   int64  `json:"id"`
 	Name string `json:"name"`
 	Name string `json:"name"`
+	Logo string `json:"logo"`
 }
 }

@@ -308,6 +308,7 @@ func UserHasCompanys(userid int64) ([]protocol.MeCompany, error) {
 		t := protocol.MeCompany{
 		t := protocol.MeCompany{
 			Id:   v.Id,
 			Id:   v.Id,
 			Name: v.Name,
 			Name: v.Name,
+			Logo: v.Logo,
 		}
 		}
 		mecompanys = append(mecompanys, t)
 		mecompanys = append(mecompanys, t)
 	}
 	}