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

Edu.Common/Enum/Course/FinanceConfigTypeEnum.cs

@@ -27,5 +27,26 @@ namespace Edu.Common.Enum.Course
         /// </summary>
         [EnumField("学生退课")]
         DropCourse = 3,
+
+        /// <summary>
+        /// 资产采购
+        /// </summary>
+        [EnumField("资产采购")]
+        AssetPurchase = 4,
+        /// <summary>
+        /// 耗材采购
+        /// </summary>
+        [EnumField("耗材采购")]
+        SuppliesPurchase = 5,
+        /// <summary>
+        /// 耗材成本
+        /// </summary>
+        [EnumField("耗材成本")]
+        SuppliesCost = 6,
+        /// <summary>
+        /// 耗材出库
+        /// </summary>
+        [EnumField("耗材出库")]
+        SuppliesStockOut = 7
     }
 }

Edu.Model/Entity/Course/RB_Finance_Config.cs

@@ -66,5 +66,10 @@ namespace Edu.Model.Entity.Course
         /// 更新时间
         /// </summary>
         public DateTime UpdateTime { get; set; }
+
+        /// <summary>
+        /// 币种id
+        /// </summary>
+        public int CurrencyId { get; set; }
     }
 }