Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Module.Product/OrderModule.cs

@@ -3749,7 +3749,7 @@ namespace Mall.Module.Product
                     });
                 }
                 goods_OrderRepository.DBSession.Commit();
-                return ApiResult.Success("", new { OrderId });
+                return ApiResult.Success("", new { OrderId, demodel.OrderNo });
             }
             catch (Exception ex)
             {
@@ -8179,7 +8179,7 @@ namespace Mall.Module.Product
                         RB_Branch_Id = Config.ExpendBranchId,
                         TemplateId = item.WorkFlowId,
                         OrderSource = 16,
-                        OtherType = 22,
+                        OtherType = 23,
                         ReFinanceId = dmodel.ReOrderId,
                         Remark = "名称:" + umodel.Name + "(" + umodel.Id + ")" + "   " + System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据(erp订单)",
                         detailList,

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -1187,6 +1187,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.TenantId,
                 x.MallBaseId,
                 x.SendArea,
+                CarouselImageList= x.CarouselImageList.Select(qitem=>qitem.Path).ToList(),
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
             return ApiResult.Success("", pagelist);