diff --git a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs
index 4e5bc79a..8f8ee0cb 100644
--- a/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs
+++ b/Src/Dlhis.Basic/MealUser/Response/MealUserResponse.cs
@@ -1,6 +1,4 @@
using Dlhis.Entity.Canteen.Enums;
-using SqlSugar.DbConvert;
-using SqlSugar;
namespace Dlhis.Basic.MealUser.Response;
@@ -9,7 +7,7 @@ public class MealUserResponse
///
/// 档案号
///
- public string UserId { get; set; }
+ public string UserNo { get; set; }
///
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 7e3ef6de..c7a94a64 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -193,7 +193,7 @@ public class OrderService : IOrderService
}
var effect = await _dbContext.Updateable()
- .SetColumns(x => x.Balance == canteenUser.Balance + order.Amount)
+ .SetColumns(x => x.Balance == canteenUser.Balance)
.SetColumns(x => x.Version == x.Version + 1)
.Where(x => x.UserNo == order.UserNo && x.Version == canteenUser.Version)//必须与查询时的version一致
.ExecuteCommandAsync();
diff --git a/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs
index bf4dc26c..ddf4eb7c 100644
--- a/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs
@@ -12,7 +12,7 @@ public class DepartmentEntity : SugarBaseEntity
///
/// 部门号
///
- [SugarColumn(ColumnDescription = "部门号")]
+ [SugarColumn(ColumnDescription = "部门号", IsNullable = false)]
public string No { get; set; }
///
@@ -24,6 +24,6 @@ public class DepartmentEntity : SugarBaseEntity
///
/// 部门名称
///
- [SugarColumn(ColumnDescription = "部门名称")]
+ [SugarColumn(ColumnDescription = "部门名称" , IsNullable = false)]
public string Name { get; set; }
}