diff --git a/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
new file mode 100644
index 00000000..8c9d1b07
--- /dev/null
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
@@ -0,0 +1,23 @@
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+///
+/// 营业点管理
+///
+[SugarTable(TableName = "BusinessPlaceManagerRelationship", TableDescription = "营业点管理关系")]
+public class BusinessPlaceManagerRelationshipEntity : SugarBaseEntity
+{
+ ///
+ /// 管理人员
+ ///
+ [SugarColumn(ColumnDescription = "管理人员", IsNullable = false)]
+ public int ManagerUserId { get; set; }
+
+ ///
+ /// 营业点
+ ///
+ [SugarColumn(ColumnDescription = "营业点", IsNullable = false)]
+ public Guid BusinessPlaceCode { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs
index 8964221f..e80d81ee 100644
--- a/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs
@@ -6,9 +6,9 @@ using SqlSugar;
namespace Dlhis.Entity.Basic.Entity;
///
-/// 营业点餐次
+/// 营业点餐别
///
-[SugarTable(TableName = "BusinessShift", TableDescription = "营业点餐次")]
+[SugarTable(TableName = "BusinessShift", TableDescription = "营业点餐别")]
public class BusinessShiftEntity : SugarBaseEntity, ITenantId
{
///
@@ -25,9 +25,9 @@ public class BusinessShiftEntity : SugarBaseEntity, ITenantId
public string CustomCode { get; set; }
///
- /// 餐次名称
+ /// 餐别名称
///
- [SugarColumn(ColumnDescription = "餐次名称")]
+ [SugarColumn(ColumnDescription = "餐别名称")]
public string Name { get; set; }
public string TenantId { get; set; }
diff --git a/Src/Dlhis.Entity/Canteen/Entities/DishesCategoryEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/DishesCategoryEntity.cs
new file mode 100644
index 00000000..0f40049f
--- /dev/null
+++ b/Src/Dlhis.Entity/Canteen/Entities/DishesCategoryEntity.cs
@@ -0,0 +1,35 @@
+using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Canteen.Entities;
+
+[SugarTable(TableName = "DishesCategory", TableDescription = "菜品分类")]
+public class DishesCategoryEntity : SugarBaseEntity, ITenantId
+{
+ ///
+ /// PCode
+ ///
+ public Guid? PCode { get; set; }
+
+ ///
+ /// Code
+ ///
+ [SugarColumn(IsNullable = false)]
+ public Guid Code { get; set; }
+
+ ///
+ /// 分类名称
+ ///
+ [SugarColumn(IsNullable = false, ColumnDescription = "名称")]
+ public string Name { get; set; }
+
+ ///
+ /// 序号
+ ///
+ [SugarColumn(IsNullable = false, ColumnDescription = "序号", DefaultValue = "100")]
+ public int Sequence { get; set; } = 100;
+
+
+ public string TenantId { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/DishesEntity.cs
similarity index 71%
rename from Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs
rename to Src/Dlhis.Entity/Canteen/Entities/DishesEntity.cs
index b28482aa..b1c9977f 100644
--- a/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs
+++ b/Src/Dlhis.Entity/Canteen/Entities/DishesEntity.cs
@@ -8,20 +8,14 @@ namespace Dlhis.Entity.Canteen.Entities;
///
/// 菜品表
///
-[SugarTable(TableName = "CanteenDishes", TableDescription = "菜品表")]
-public class CanteenDishesEntity : SugarBaseEntity, ITenantId
+[SugarTable(TableName = "Dishes", TableDescription = "菜品表")]
+public class DishesEntity : SugarBaseEntity, ITenantId
{
///
- /// 大类
- ///
- [SugarColumn(ColumnDescription = "父类")]
- public string PCategory { get; set; }
-
- ///
- /// 小类
+ /// 分类
///
[SugarColumn(ColumnDescription = "分类", IsNullable = false)]
- public string Category { get; set; }
+ public Guid CategoryCode { get; set; }
///
/// 营业点
@@ -41,12 +35,6 @@ public class CanteenDishesEntity : SugarBaseEntity, ITenantId
[SugarColumn(ColumnDescription = "菜品名称", IsNullable = false)]
public string Name { get; set; }
- /////
- ///// 类型
- /////
- //[SugarColumn(ColumnDescription = "类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
- //public CanteenDishesEnumType Type { get; set; }
-
///
/// 描述
///
diff --git a/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs
index d760412a..410b9f27 100644
--- a/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs
+++ b/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs
@@ -1,41 +1,40 @@
using System.ComponentModel;
-namespace Dlhis.Entity.Canteen.Enums
+namespace Dlhis.Entity.Canteen.Enums;
+
+///
+/// 餐次 ShiftEnumType
+///
+[Description("餐次")]
+public enum ShiftEnumType
{
///
- /// 餐次
+ /// 早餐
///
- [Description("餐次")]
- public enum ShiftEnumType
- {
- ///
- /// 早餐
- ///
- [Description("早餐")]
- Breakfast = 1,
+ [Description("早餐")]
+ Breakfast = 1,
- ///
- /// 午餐
- ///
- [Description("午餐")]
- Lunch = 2,
+ ///
+ /// 午餐
+ ///
+ [Description("午餐")]
+ Lunch = 2,
- ///
- /// 晚餐
- ///
- [Description("晚餐")]
- Dinner = 3,
+ ///
+ /// 晚餐
+ ///
+ [Description("晚餐")]
+ Dinner = 3,
- ///
- /// 宵夜
- ///
- [Description("宵夜")]
- Nightsnack = 4,
+ ///
+ /// 宵夜
+ ///
+ [Description("宵夜")]
+ Nightsnack = 4,
- ///
- /// 凌晨餐
- ///
- [Description("凌晨餐")]
- Midnightsnack = 5,
- }
+ ///
+ /// 凌晨餐
+ ///
+ [Description("凌晨餐")]
+ Midnightsnack = 5,
}
\ No newline at end of file