Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

server/canteen/internal/logic/getcanteendetaillogic.go

@@ -94,9 +94,9 @@ func (l *GetCanteenDetailLogic) GetCanteenDetail(req *types.GetCanteenDetailReq,
 		mapSize[v.Id] = v
 	}
 	//组装返回
-	list := make([]types.CanteenProduct, 0, len(canteenProductList))
+	list := make([]*types.CanteenProduct, 0, len(canteenProductList))
 	for _, v := range canteenProductList {
-		data := types.CanteenProduct{
+		data := &types.CanteenProduct{
 			Id:     v.Id,
 			SizeId: *v.SizeId,
 			SId:    *v.Sid,

server/canteen/internal/types/types.go

@@ -10,9 +10,9 @@ type GetCanteenDetailReq struct {
 }
 
 type GetCanteenDetailRsp struct {
-	Id          int64            `json:"id"`
-	Name        string           `json:"name"`
-	ProductList []CanteenProduct `json:"product_list"`
+	Id          int64             `json:"id"`
+	Name        string            `json:"name"`
+	ProductList []*CanteenProduct `json:"product_list"`
 }
 
 type CanteenProduct struct {