Merge branch 'master' of https://code.fnuoos.com/EggPlanet/egg_admin

app/svc/article/svc_list.go

@@ -110,7 +110,7 @@ func Save(c *gin.Context) {
 	data.Sort = utils.StrToInt(req.Sort)
 	data.Pid = utils.StrToInt(req.Pid)
 	data.IsShow = utils.StrToInt(req.IsShow)
-	db.Db.Where("id=?", data.Id).Update(data)
+	db.Db.Where("id=?", data.Id).AllCols().Update(data)
 	e.OutSuc(c, "success", nil)
 	return
 }

app/svc/user_feedback/svc_cate.go

@@ -55,7 +55,7 @@ func CateSave(c *gin.Context) {
 	}
 	data.Name = req.Name
 	data.Sort = utils.StrToInt(req.Sort)
-	db.Db.Where("id=?", data.Id).Update(data)
+	db.Db.Where("id=?", data.Id).AllCols().Update(data)
 	e.OutSuc(c, "success", nil)
 	return
 }

app/svc/user_feedback/svc_list.go

@@ -73,6 +73,9 @@ func List(c *gin.Context) {
 					v.Phone = user.Phone
 				}
 			}
+			for k1, v1 := range img {
+				img[k1] = svc.GetOssUrl(v1)
+			}
 			tmp := md.UserFeedbackList{
 				Id:       utils.IntToStr(v.Id),
 				Phone:    v.Phone,