提交代码

Mall.Education/Mall.Education.csproj

@@ -51,8 +51,9 @@
     <Reference Include="Aliyun.OSS, Version=2.11.0.0, Culture=neutral, PublicKeyToken=0ad4175f0dac0b9b, processorArchitecture=MSIL">
       <HintPath>..\packages\Aliyun.OSS.SDK.2.11.0\lib\net45\Aliyun.OSS.dll</HintPath>
     </Reference>
-    <Reference Include="Aspose.Pdf, Version=17.1.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
-      <HintPath>..\packages\Aspose.Pdf.17.1.0\lib\net40-client\Aspose.Pdf.dll</HintPath>
+    <Reference Include="Aspose.PDF, Version=23.4.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
+      <HintPath>..\packages\Aspose.PDF.23.4.0\lib\net4.0\Aspose.PDF.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Aspose.Slides, Version=17.1.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
       <HintPath>..\packages\Aspose.Slides.NET.17.1\lib\net4.0-client\Aspose.Slides.dll</HintPath>

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -419,5 +419,10 @@ namespace Mall.Model.Entity.Product
         /// 耗材对应的ID
         /// </summary>
         public int MaterialId { get; set; }
+
+        /// <summary>
+        /// 和平商旅下单自定义表单内容
+        /// </summary>
+        public string CustomFormInfo { get; set; }
     }
 }