diff --git a/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs b/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs
index d57afc08d8985481375cc9e7ec3ca28d50889cd2..2112e37d4fc2345612fca1055a240cf7b589c125 100644
--- a/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs
+++ b/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs
@@ -86,7 +86,7 @@ namespace EOM.TSHotelManager.Application
             RoomType roomtype = new RoomType();
             Room room = new Room();
             room = roomRepository.GetSingle(a => a.RoomNo == no && a.delete_mk != 1);
-            roomtype.RoomName = roomTypeRepository.GetSingle(a => a.Roomtype == room.RoomStateId).RoomName;
+            roomtype.RoomName = roomTypeRepository.GetSingle(a => a.Roomtype == room.RoomType).RoomName;
             return roomtype;
         }
         #endregion
diff --git a/EOM.TSHotelManager.Common.Core/Business/Cash/Cash.cs b/EOM.TSHotelManager.Common.Core/Business/Cash/Cash.cs
index 2184fa3f22ba0f8dedf9e14b1e82c2756fe3de62..02fe1b230fe0f5d4ca429a5575956f31c0b69eac 100644
--- a/EOM.TSHotelManager.Common.Core/Business/Cash/Cash.cs
+++ b/EOM.TSHotelManager.Common.Core/Business/Cash/Cash.cs
@@ -22,6 +22,7 @@
  *
  *模块说明：资产类
  */
+using EOM.TSHotelManager.Common.Util;
 using System;
 namespace EOM.TSHotelManager.Common.Core
 {
@@ -34,23 +35,28 @@ namespace EOM.TSHotelManager.Common.Core
         /// <summary>
         /// 资产编号
         /// </summary>
+        [NeedValid]
         public string CashNo { get; set; }
         /// <summary>
         /// 资产名称
         /// </summary>
+        [NeedValid]
         public string CashName { get; set; }
         /// <summary>
         /// 资产总值
         /// </summary>
+        [NeedValid]
         public decimal CashPrice { get; set; }
         /// <summary>
         /// 资产总值描述
         /// </summary>
         [SqlSugar.SugarColumn(IsIgnore = true)]
+        [NeedValid]
         public string CashPriceStr { get; set; }
         /// <summary>
         /// 所属部门
         /// </summary>
+        [NeedValid]
         public string CashClub { get; set; }
         /// <summary>
         /// 所属部门描述
@@ -60,14 +66,17 @@ namespace EOM.TSHotelManager.Common.Core
         /// <summary>
         /// 入库时间
         /// </summary>
+        [NeedValid]
         public DateTime CashTime { get; set; }
         /// <summary>
         /// 资产来源
         /// </summary>
+        [NeedValid]
         public string CashSource { get; set; }
         /// <summary>
         /// 资产经办人
         /// </summary>
+        [NeedValid]
         public string CashPerson { get; set; }
         /// <summary>
         /// 资产经办人
diff --git a/EOM.TSHotelManager.Common.Core/Business/Room/Room.cs b/EOM.TSHotelManager.Common.Core/Business/Room/Room.cs
index e5c8e8db3e8e3f9919fa032fd39a9948cece975f..b49e67234ea0c4b6f38a26831e98bca222fa34af 100644
--- a/EOM.TSHotelManager.Common.Core/Business/Room/Room.cs
+++ b/EOM.TSHotelManager.Common.Core/Business/Room/Room.cs
@@ -22,6 +22,7 @@
  *
  *模块说明：房间类
  */
+using EOM.TSHotelManager.Common.Util;
 using System;
 //using System.ComponentModel.DataAnnotations.Schema;
 
@@ -37,11 +38,13 @@ namespace EOM.TSHotelManager.Common.Core
         /// 房间编号
         /// </summary>
         [SqlSugar.SugarColumn(ColumnName = "room_no", IsPrimaryKey = true)]
+        [NeedValid]
         public string RoomNo { get; set; }
         /// <summary>
         /// 房间类型
         /// </summary>
         [SqlSugar.SugarColumn(ColumnName = "room_type")]
+        [NeedValid]
         public int RoomType { get; set; }
         /// <summary>
         /// 客户编号
@@ -67,6 +70,7 @@ namespace EOM.TSHotelManager.Common.Core
         /// 房间状态ID
         /// </summary>
         [SqlSugar.SugarColumn(ColumnName = "room_state_id")]
+        [NeedValid]
         public int RoomStateId { get; set; }
         /// <summary>
         /// 房间状态
@@ -77,16 +81,19 @@ namespace EOM.TSHotelManager.Common.Core
         /// 房间单价
         /// </summary>
         [SqlSugar.SugarColumn(ColumnName = "room_rent")]
+        [NeedValid]
         public decimal RoomMoney { get; set; }
         /// <summary>
         /// 房间押金
         /// </summary>
         [SqlSugar.SugarColumn(ColumnName = "room_deposit")]
+        [NeedValid]
         public decimal RoomDeposit { get; set; }
         /// <summary>
         /// 房间位置
         /// </summary>
         [SqlSugar.SugarColumn(ColumnName = "room_position")]
+        [NeedValid]
         public string RoomPosition { get; set; }
         /// <summary>
         /// 客户类型名称
diff --git a/EOM.TSHotelManager.Common.Core/EOM.TSHotelManager.Common.Core.csproj b/EOM.TSHotelManager.Common.Core/EOM.TSHotelManager.Common.Core.csproj
index af072397d59ee41f4c00af79f380437af34e048b..227c02999b35e475cdfbe265142ebada4b69c3e8 100644
--- a/EOM.TSHotelManager.Common.Core/EOM.TSHotelManager.Common.Core.csproj
+++ b/EOM.TSHotelManager.Common.Core/EOM.TSHotelManager.Common.Core.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj" />
+    <ProjectReference Include="..\EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/EOM.TSHotelManager.Common.Core/Zero/Admin.cs b/EOM.TSHotelManager.Common.Core/Zero/Admin.cs
index 4b1b7ae935fb7bf60f15b59c8418b1baf62af2a4..2f65d523421e63d6b4216e164921db46a2ba545a 100644
--- a/EOM.TSHotelManager.Common.Core/Zero/Admin.cs
+++ b/EOM.TSHotelManager.Common.Core/Zero/Admin.cs
@@ -22,6 +22,8 @@
  *
  *模块说明：管理员实体类
  */
+using EOM.TSHotelManager.Common.Util;
+
 namespace EOM.TSHotelManager.Common.Core
 {
     /// <summary>
@@ -47,30 +49,35 @@ namespace EOM.TSHotelManager.Common.Core
         /// 管理员账号
         /// </summary>
         [SqlSugar.SugarColumn(IsPrimaryKey = true)]
+        [NeedValid]
         public string AdminAccount { get { return this._AdminAccount; } set { this._AdminAccount = value; } }
 
         private string _AdminPassword;
         /// <summary>
         /// 管理员密码
         /// </summary>
+        [NeedValid]
         public string AdminPassword { get { return this._AdminPassword; } set { this._AdminPassword = value; } }
 
         private string _AdminType;
         /// <summary>
         /// 管理员类型
         /// </summary>
+        [NeedValid]
         public string AdminType { get { return this._AdminType; } set { this._AdminType = value; } }
 
         private string _AdminName;
         /// <summary>
         /// 管理员名称
         /// </summary>
+        [NeedValid]
         public string AdminName { get { return this._AdminName; } set { this._AdminName = value; } }
 
         private System.Int32 _IsAdmin;
         /// <summary>
         /// 是否为超级管理员
         /// </summary>
+        [NeedValid]
         public System.Int32 IsAdmin { get { return this._IsAdmin; } set { this._IsAdmin = value; } }
 
         private System.Int32 _DeleteMk;
diff --git a/EOM.TSHotelManager.Common.Util/EOM.TSHotelManager.Common.Util.csproj b/EOM.TSHotelManager.Common.Util/EOM.TSHotelManager.Common.Util.csproj
new file mode 100644
index 0000000000000000000000000000000000000000..dbdcea46b6e2047549bb86fc8f27032d25c0611f
--- /dev/null
+++ b/EOM.TSHotelManager.Common.Util/EOM.TSHotelManager.Common.Util.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs b/EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs
new file mode 100644
index 0000000000000000000000000000000000000000..1b1e088b645f4d3507c376d93427de56edc49bbc
--- /dev/null
+++ b/EOM.TSHotelManager.Common.Util/Validator/NeedValidAttribute.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EOM.TSHotelManager.Common.Util
+{
+    [AttributeUsage(AttributeTargets.Property)]
+    public class NeedValidAttribute : Attribute
+    {
+    }
+}
diff --git a/EOM.TSHotelManager.Common.Util/Validator/ValidateHelper.cs b/EOM.TSHotelManager.Common.Util/Validator/ValidateHelper.cs
new file mode 100644
index 0000000000000000000000000000000000000000..94cf3ca7b0ca379aecd18753b2f4e4bb0bf3890f
--- /dev/null
+++ b/EOM.TSHotelManager.Common.Util/Validator/ValidateHelper.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EOM.TSHotelManager.Common.Util
+{
+    public static class ValidateHelper
+    {
+        public static bool Validate(object obj)
+        {
+            Type type = obj.GetType();
+
+            // 遍历所有属性
+            foreach (PropertyInfo property in type.GetProperties(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance))
+            {
+                // 检查属性是否具有 NeedValid 特性
+                if (Attribute.IsDefined(property, typeof(NeedValidAttribute)))
+                {
+                    // 获取属性的值
+                    object value = property.GetValue(obj);
+
+                    // 根据不同的类型进行校验
+                    if (value is string strValue && string.IsNullOrEmpty(strValue))
+                    {
+                        return false;
+                    }
+                    else if (value is int intValue && intValue < 0)
+                    {
+                        return false;
+                    }
+                    else if (value is decimal decValue && decValue < 0)
+                    {
+                        return false;
+                    }
+                    else if (value is double doubleValue && doubleValue < 0)
+                    {
+                        return false;
+                    }
+                    else if (value is float floatValue && floatValue < 0)
+                    {
+                        return false;
+                    }
+                    else if (value is DateTime dateTimeValue && dateTimeValue == default)
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            // 如果所有校验均通过
+            return true;
+        }
+    }
+}
diff --git a/EOM.TSHotelManager.EntityFramework/EOM.TSHotelManager.EntityFramework.csproj b/EOM.TSHotelManager.EntityFramework/EOM.TSHotelManager.EntityFramework.csproj
index 4dcc7d4e39a2f64cc36f082f628fb4c2befb59f0..e5fbd4a5e0958ecdcee390824bd9aa1b99a64f07 100644
--- a/EOM.TSHotelManager.EntityFramework/EOM.TSHotelManager.EntityFramework.csproj
+++ b/EOM.TSHotelManager.EntityFramework/EOM.TSHotelManager.EntityFramework.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Npgsql" Version="5.0.7" />
+    <PackageReference Include="Npgsql" Version="5.0.18" />
     <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.3.45" />
   </ItemGroup>
 
diff --git a/EOM.TSHotelManager.Web.sln b/EOM.TSHotelManager.Web.sln
index ad60089f602598d19a91eb27c261218974bc9e8a..ba38788db7b0c76a3f45f24335e05b0f00285858 100644
--- a/EOM.TSHotelManager.Web.sln
+++ b/EOM.TSHotelManager.Web.sln
@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library", "Library\Library.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Core", "EOM.TSHotelManager.Common.Core\EOM.TSHotelManager.Common.Core.csproj", "{D99F4527-C620-4073-92B1-254A6C7FA363}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Util", "EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj", "{4D8B62E1-2D40-47E6-912D-D7B08F3F031A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{D99F4527-C620-4073-92B1-254A6C7FA363}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D99F4527-C620-4073-92B1-254A6C7FA363}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D99F4527-C620-4073-92B1-254A6C7FA363}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D8B62E1-2D40-47E6-912D-D7B08F3F031A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D8B62E1-2D40-47E6-912D-D7B08F3F031A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D8B62E1-2D40-47E6-912D-D7B08F3F031A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D8B62E1-2D40-47E6-912D-D7B08F3F031A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE