Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Extend/TradePavilion/RB_EnterpriseServices_Extend.cs

@@ -27,5 +27,10 @@ namespace Mall.Model.Extend.TradePavilion
         /// ids
         /// </summary>
         public string SelectIds { get; set; }
+
+        /// <summary>
+        /// 收藏id
+        /// </summary>
+        public int CollectId { get; set; }
     }
 }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -3225,7 +3225,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
             var result = new
             {
-                CollectId = 0,
+                CollectId ,
                 ServiceId = extModel?.ServiceId ?? 0,
                 Name = extModel?.Name ?? "",
                 Introduction = extModel?.Introduction ?? "",
@@ -3244,7 +3244,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 RentFee = extModel?.RentFee ?? 0,
                 BannerList = extModel?.BannerList ?? new List<string>(),
             };
-            return ApiResult.Success(data: extModel);
+            return ApiResult.Success(data: result);
         }
         #endregion