diff --git a/.gitmodules b/.gitmodules
index 6511dd1868f68711f3b47e1131067db44f534672..968a7c2c6185d8b741531eaa625fb31aa6d3f269 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "topsky-hotel-manager-system-web-api"]
-	path = topsky-hotel-manager-system-web-api
-	url = https://gitee.com/java-and-net/topsky-hotel-manager-system-web-api.git
+[submodule "topsky-hotel-management-system-web-api"]
+	path = topsky-hotel-management-system-web-api
+	url = https://gitee.com/java-and-net/topsky-hotel-management-system-web-api.git
diff --git a/EOM.Client.TopSkyHotelManagerSystem.sln b/EOM.Client.TopSkyHotelManagementSystem.sln
similarity index 78%
rename from EOM.Client.TopSkyHotelManagerSystem.sln
rename to EOM.Client.TopSkyHotelManagementSystem.sln
index 358811680b54e997bc9aeb6f56fe932581406726..c877a7bcf5c776c1a24a497afc488cf0bc084d09 100644
--- a/EOM.Client.TopSkyHotelManagerSystem.sln
+++ b/EOM.Client.TopSkyHotelManagementSystem.sln
@@ -6,21 +6,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Api", "Api", "{6A3E4936-8B9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{3B8902EC-CAB9-406A-AAF7-24DABD885AC0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Application", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Application\EOM.TSHotelManager.Application.csproj", "{B55975AB-2C89-4C01-B107-D87FCA21A5E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Application", "topsky-hotel-management-system-web-api\EOM.TSHotelManagement.Application\EOM.TSHotelManagement.Application.csproj", "{B55975AB-2C89-4C01-B107-D87FCA21A5E3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.EntityFramework", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.EntityFramework\EOM.TSHotelManager.EntityFramework.csproj", "{8F5CF88A-1111-44CC-AFFA-4637EA10E191}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.EntityFramework", "topsky-hotel-management-system-web-api\EOM.TSHotelManagement.EntityFramework\EOM.TSHotelManagement.EntityFramework.csproj", "{8F5CF88A-1111-44CC-AFFA-4637EA10E191}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.WebApi", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.WebApi\EOM.TSHotelManager.WebApi.csproj", "{566D7064-EA90-45C1-93B7-F512BBAD7BA1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.WebApi", "topsky-hotel-management-system-web-api\EOM.TSHotelManagement.WebApi\EOM.TSHotelManagement.WebApi.csproj", "{566D7064-EA90-45C1-93B7-F512BBAD7BA1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Core", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Core\EOM.TSHotelManager.Common.Core.csproj", "{48B3F864-88D2-4BD1-A766-B9EBF342AED1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Common.Core", "topsky-hotel-management-system-web-api\EOM.TSHotelManagement.Common.Core\EOM.TSHotelManagement.Common.Core.csproj", "{48B3F864-88D2-4BD1-A766-B9EBF342AED1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common.Util", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj", "{9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Common.Util", "topsky-hotel-management-system-web-api\EOM.TSHotelManagement.Common.Util\EOM.TSHotelManagement.Common.Util.csproj", "{9A62B6BE-7C26-465F-A8D1-2CEE66D6F837}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Common", "EOM.TSHotelManager.Common\EOM.TSHotelManager.Common.csproj", "{781CEE04-DDB4-4037-8175-9A6548716871}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Common", "EOM.TSHotelManagement.Common\EOM.TSHotelManagement.Common.csproj", "{781CEE04-DDB4-4037-8175-9A6548716871}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.FormUI", "EOM.TSHotelManager.FormUI\EOM.TSHotelManager.FormUI.csproj", "{D89E76F5-007B-4915-91A8-265CCA6814BF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.FormUI", "EOM.TSHotelManagement.FormUI\EOM.TSHotelManagement.FormUI.csproj", "{D89E76F5-007B-4915-91A8-265CCA6814BF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManager.Shared", "topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Shared\EOM.TSHotelManager.Shared.csproj", "{1A37446C-A721-4507-89B5-7BFF6F66A004}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Shared", "topsky-hotel-management-system-web-api\EOM.TSHotelManagement.Shared\EOM.TSHotelManagement.Shared.csproj", "{1A37446C-A721-4507-89B5-7BFF6F66A004}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/EOM.TSHotelManagement.Common/AppConstant/AdminConstant.cs b/EOM.TSHotelManagement.Common/AppConstant/AdminConstant.cs
new file mode 100644
index 0000000000000000000000000000000000000000..a223724bba85885a819c7b692bfa012cd17ddc98
--- /dev/null
+++ b/EOM.TSHotelManagement.Common/AppConstant/AdminConstant.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EOM.TSHotelManagement.Common
+{
+    public class AdminConstant : Constant<AdminConstant>
+    {
+        // 超级管理员
+        public static readonly AdminConstant Admin = new AdminConstant("Admin", "超级管理员");
+        // 财务经理
+        public static readonly AdminConstant FinanceManager = new AdminConstant("FinanceManager", "财务经理");
+        // 总经理
+        public static readonly AdminConstant GeneralManager = new AdminConstant("GeneralManager", "总经理");
+        // 酒店经理
+        public static readonly AdminConstant HotelManager = new AdminConstant("HotelManager", "酒店经理");
+        // 人力资源经理
+        public static readonly AdminConstant HRManager = new AdminConstant("HRManager", "人力资源经理");
+        // 后勤经理
+        public static readonly AdminConstant LogisticsManager = new AdminConstant("LogisticsManager", "后勤经理");
+        // 监管小组
+        public static readonly AdminConstant CheckGroup = new AdminConstant("CheckGroup", "监管小组");
+
+        private AdminConstant(string code, string description) : base(code, description)
+        {
+        }
+    }
+}
diff --git a/EOM.TSHotelManager.Common/AppConstant/Constant.cs b/EOM.TSHotelManagement.Common/AppConstant/Constant.cs
similarity index 96%
rename from EOM.TSHotelManager.Common/AppConstant/Constant.cs
rename to EOM.TSHotelManagement.Common/AppConstant/Constant.cs
index 12fe684ca1bebca22a9906fa516f0572f98a8600..4e056a37068d1628504051b4e1671e2af45e9330 100644
--- a/EOM.TSHotelManager.Common/AppConstant/Constant.cs
+++ b/EOM.TSHotelManagement.Common/AppConstant/Constant.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     public class Constant<T> where T : Constant<T>
     {
diff --git a/EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs b/EOM.TSHotelManagement.Common/AppConstant/CustomTypeConstant.cs
similarity index 94%
rename from EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs
rename to EOM.TSHotelManagement.Common/AppConstant/CustomTypeConstant.cs
index 557a75dacb200fb8d4ad4557d020734ed1381145..f200f300c80ab13e88ca22b29c700bd06f258572 100644
--- a/EOM.TSHotelManager.Common/AppConstant/CustomTypeConstant.cs
+++ b/EOM.TSHotelManagement.Common/AppConstant/CustomTypeConstant.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     public class CustomTypeConstant : Constant<CustomTypeConstant>
     {
diff --git a/EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs b/EOM.TSHotelManagement.Common/AppConstant/PassportConstant.cs
similarity index 96%
rename from EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs
rename to EOM.TSHotelManagement.Common/AppConstant/PassportConstant.cs
index 096fe7458088c47bbea682e3de1cd5b48ff2ee25..ef63e9a7eebaa2a17fc0eebaa80a080afd5e8015 100644
--- a/EOM.TSHotelManager.Common/AppConstant/PassportConstant.cs
+++ b/EOM.TSHotelManagement.Common/AppConstant/PassportConstant.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     public class PassportConstant : Constant<PassportConstant>
     {
diff --git a/EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs b/EOM.TSHotelManagement.Common/AppConstant/RoomStateConstant.cs
similarity index 94%
rename from EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs
rename to EOM.TSHotelManagement.Common/AppConstant/RoomStateConstant.cs
index cd8c2a2eb3db8c8e8a95f46fb59228ddb55f8be6..b986172627221f083198e4d957263ddc945916db 100644
--- a/EOM.TSHotelManager.Common/AppConstant/RoomStateConstant.cs
+++ b/EOM.TSHotelManagement.Common/AppConstant/RoomStateConstant.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     public class RoomStateConstant : Constant<RoomStateConstant>
     {
diff --git a/EOM.TSHotelManager.Common/AppConstant/SexConstant.cs b/EOM.TSHotelManagement.Common/AppConstant/SexConstant.cs
similarity index 89%
rename from EOM.TSHotelManager.Common/AppConstant/SexConstant.cs
rename to EOM.TSHotelManagement.Common/AppConstant/SexConstant.cs
index f20ade00f00f0a68e881a113512f723767cfde3a..c75dd922973c2c8b6af035ef5c421b05bd6ee07e 100644
--- a/EOM.TSHotelManager.Common/AppConstant/SexConstant.cs
+++ b/EOM.TSHotelManagement.Common/AppConstant/SexConstant.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     public class SexConstant : Constant<SexConstant>
     {
diff --git a/EOM.TSHotelManager.Common/EOM.TSHotelManager.Common.csproj b/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj
similarity index 80%
rename from EOM.TSHotelManager.Common/EOM.TSHotelManager.Common.csproj
rename to EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj
index 885b5518342a35a562e830a4243188939ebb6aad..818c91234223c5308dcbe42285953b0c94004d67 100644
--- a/EOM.TSHotelManager.Common/EOM.TSHotelManager.Common.csproj
+++ b/EOM.TSHotelManagement.Common/EOM.TSHotelManagement.Common.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Core\EOM.TSHotelManager.Common.Core.csproj" />
+    <ProjectReference Include="..\topsky-hotel-management-system-web-api\EOM.TSHotelManagement.Common.Core\EOM.TSHotelManagement.Common.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/EOM.TSHotelManager.Common/Helper/HttpHelper.cs b/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs
similarity index 87%
rename from EOM.TSHotelManager.Common/Helper/HttpHelper.cs
rename to EOM.TSHotelManagement.Common/Helper/HttpHelper.cs
index 11dec7e5509265c3aaeab18b3165a1957bd24529..b2fec7bac6a0187792602153cdc397c880f7d796 100644
--- a/EOM.TSHotelManager.Common/Helper/HttpHelper.cs
+++ b/EOM.TSHotelManagement.Common/Helper/HttpHelper.cs
@@ -8,7 +8,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Web;
 
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     /// <summary>
     /// 文件上传帮助类
@@ -113,7 +113,31 @@ namespace EOM.TSHotelManager.Common
         /// <param name="json"></param>
         /// <param name="dic"></param>
         /// <returns></returns>
-        public static ResponseMsg Request(string url, string? json = null, Dictionary<string, string>? dic = null)
+        public static ResponseMsg Request(string url)
+        {
+            ResponseMsg msg = new ResponseMsg();
+
+            //处理url
+            var sourceStr = url.Replace("​", string.Empty);
+
+            //解密原始URL
+            var api = encrypt.Decryption(apiUrl);
+
+            var requestUrl = api + sourceStr;
+
+            msg = DoGet(requestUrl);
+
+            return msg;
+        }
+
+        /// <summary>
+        /// 统一请求方法
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="json"></param>
+        /// <param name="dic"></param>
+        /// <returns></returns>
+        public static ResponseMsg Request(string url, string? json = null)
         {
             ResponseMsg msg = new ResponseMsg();
 
@@ -129,7 +153,34 @@ namespace EOM.TSHotelManager.Common
             {
                 msg = DoPost(requestUrl, json);
             }
-            else if (!dic.IsNullOrEmpty())
+            else
+            {
+                msg = DoGet(requestUrl);
+            }
+
+            return msg;
+        }
+
+        /// <summary>
+        /// 统一请求方法
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="json"></param>
+        /// <param name="dic"></param>
+        /// <returns></returns>
+        public static ResponseMsg Request(string url, Dictionary<string, string>? dic = null)
+        {
+            ResponseMsg msg = new ResponseMsg();
+
+            //处理url
+            var sourceStr = url.Replace("​", string.Empty);
+
+            //解密原始URL
+            var api = encrypt.Decryption(apiUrl);
+
+            var requestUrl = api + sourceStr;
+
+            if (!dic.IsNullOrEmpty())
             {
                 msg = DoGet(requestUrl, dic);
             }
@@ -146,14 +197,22 @@ namespace EOM.TSHotelManager.Common
         /// </summary>
         /// <param name="requests"></param>
         /// <returns></returns>
-        public static Dictionary<string, ResponseMsg> RaiseRequests(Dictionary<string, (string? json, Dictionary<string, string>? dic)> requests)
+        public static Dictionary<string, ResponseMsg> RaiseBatchRequest(Dictionary<string, (string? json, Dictionary<string, string>? dic)> requests)
         {
             var results = new Dictionary<string, ResponseMsg>();
 
             foreach (var (url, (json, dic)) in requests)
             {
-                var result = Request(url, json, dic);
-                results[url] = result;
+                var result = Request(url);
+                if (!json.IsNullOrEmpty())
+                {
+                    result = Request(url, json);
+                }
+                else if (!dic.IsNullOrEmpty())
+                {
+                    result = Request(url, dic);
+                }
+                results.Add(url, result);
             }
 
             return results;
diff --git a/EOM.TSHotelManager.Common/Helper/ResponseMsg.cs b/EOM.TSHotelManagement.Common/Helper/ResponseMsg.cs
similarity index 86%
rename from EOM.TSHotelManager.Common/Helper/ResponseMsg.cs
rename to EOM.TSHotelManagement.Common/Helper/ResponseMsg.cs
index 398fb453840e64833248cb202c25460b05dc9d3f..21c073f46a99e83a3d55586d89823e04a0b82a5d 100644
--- a/EOM.TSHotelManager.Common/Helper/ResponseMsg.cs
+++ b/EOM.TSHotelManagement.Common/Helper/ResponseMsg.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     public class ResponseMsg
     {
diff --git a/EOM.TSHotelManager.Common/LocalInfo/AdminInfo.cs b/EOM.TSHotelManagement.Common/LocalInfo/AdminInfo.cs
similarity index 98%
rename from EOM.TSHotelManager.Common/LocalInfo/AdminInfo.cs
rename to EOM.TSHotelManagement.Common/LocalInfo/AdminInfo.cs
index e985b753cab14fb39cc9fc7e2f71c7b09d1ff0d3..d99eaa38d28d7a25c792213692ee799fad12e102 100644
--- a/EOM.TSHotelManager.Common/LocalInfo/AdminInfo.cs
+++ b/EOM.TSHotelManagement.Common/LocalInfo/AdminInfo.cs
@@ -22,7 +22,7 @@
  *
  *模块说明：管理员信息静态类
  */
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     /// <summary>
     /// 管理员信息静态类(后台管理员登入后的本地信息存储)
diff --git a/EOM.TSHotelManager.Common/LocalInfo/LoginInfo.cs b/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs
similarity index 98%
rename from EOM.TSHotelManager.Common/LocalInfo/LoginInfo.cs
rename to EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs
index 1efb15d6f01283924bf5461b58a525bd695fc3b1..114dfc2d45891c2919d54faec5fccb7d21c913e9 100644
--- a/EOM.TSHotelManager.Common/LocalInfo/LoginInfo.cs
+++ b/EOM.TSHotelManagement.Common/LocalInfo/LoginInfo.cs
@@ -22,7 +22,7 @@
  *
  *模块说明：登录信息静态类(前台工作人员登入后的本地信息存储)
  */
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     /// <summary>
     /// 登录信息静态类(前台工作人员登入后的本地信息存储)
diff --git a/EOM.TSHotelManager.Common/Util/ApplicationUtil.cs b/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs
similarity index 99%
rename from EOM.TSHotelManager.Common/Util/ApplicationUtil.cs
rename to EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs
index 80c110b8277e040b22837ca276c426d6242c46bf..eca25d8f8974aebb2f4c6464c51d2b25e6bc17b7 100644
--- a/EOM.TSHotelManager.Common/Util/ApplicationUtil.cs
+++ b/EOM.TSHotelManagement.Common/Util/ApplicationUtil.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using System.Text;
 
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     /// <summary>
     /// 静态工具
@@ -23,7 +23,7 @@ namespace EOM.TSHotelManager.Common
         {
             Dictionary<string, string> dic = new Dictionary<string, string>();
             dic.Add("identityCard", code.Substring(0, 6));
-            ResponseMsg result = HttpHelper.Request("App/SelectCardCode", null, dic);
+            ResponseMsg result = HttpHelper.Request("App/SelectCardCode", dic);
             if (result.statusCode != 200)
             {
                 return new Card { message = "SelectCardCode+接口服务异常，请提交Issue或尝试更新版本！" };
diff --git a/EOM.TSHotelManager.Common/Util/ExportHelper.cs b/EOM.TSHotelManagement.Common/Util/ExportHelper.cs
similarity index 99%
rename from EOM.TSHotelManager.Common/Util/ExportHelper.cs
rename to EOM.TSHotelManagement.Common/Util/ExportHelper.cs
index e6efac2226ea45b32b95d6ad8c2dcfc0fd6a2f13..25121980606afa48d2806460b425423827ccf078 100644
--- a/EOM.TSHotelManager.Common/Util/ExportHelper.cs
+++ b/EOM.TSHotelManagement.Common/Util/ExportHelper.cs
@@ -3,7 +3,7 @@ using NPOI.SS.UserModel;
 using NPOI.XSSF.UserModel;
 using System.Data;
 
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     /// <summary>
     /// 导出助手
diff --git a/EOM.TSHotelManager.Common/Util/RecordHelper.cs b/EOM.TSHotelManagement.Common/Util/RecordHelper.cs
similarity index 93%
rename from EOM.TSHotelManager.Common/Util/RecordHelper.cs
rename to EOM.TSHotelManagement.Common/Util/RecordHelper.cs
index 8395d814aaad76a2719232f8808c6c3268b97173..11083e8a54f5cd7c645016f67a6008238fd7164f 100644
--- a/EOM.TSHotelManager.Common/Util/RecordHelper.cs
+++ b/EOM.TSHotelManagement.Common/Util/RecordHelper.cs
@@ -1,6 +1,6 @@
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common.Core;
 
-namespace EOM.TSHotelManager.Common
+namespace EOM.TSHotelManagement.Common
 {
     /// <summary>
     /// 日志记录助手
diff --git a/EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs b/EOM.TSHotelManagement.FormUI/ApiExtractor/ApiConstant.cs
similarity index 81%
rename from EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs
rename to EOM.TSHotelManagement.FormUI/ApiExtractor/ApiConstant.cs
index 3f1876b2674e546bac44f7294a2cf9c13a80d1d4..22b1d94b80c5f436f0acacac3a6f3271f269723b 100644
--- a/EOM.TSHotelManager.FormUI/ApiExtractor/ApiConstant.cs
+++ b/EOM.TSHotelManagement.FormUI/ApiExtractor/ApiConstant.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public static class ApiConstant
     {
diff --git a/EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs b/EOM.TSHotelManagement.FormUI/ApiExtractor/SwaggerExtractor.cs
similarity index 93%
rename from EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs
rename to EOM.TSHotelManagement.FormUI/ApiExtractor/SwaggerExtractor.cs
index 862000fd6f949fabc87520e8f023e644f3c760f2..32903096048a8f31e19da3cc60d44b602c08a3d2 100644
--- a/EOM.TSHotelManager.FormUI/ApiExtractor/SwaggerExtractor.cs
+++ b/EOM.TSHotelManagement.FormUI/ApiExtractor/SwaggerExtractor.cs
@@ -1,8 +1,8 @@
-using EOM.TSHotelManager.Common;
+using EOM.TSHotelManagement.Common;
 using Newtonsoft.Json;
 using RestSharp;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public class SwaggerExtractor
     {
diff --git a/EOM.TSHotelManager.FormUI/App.config b/EOM.TSHotelManagement.FormUI/App.config
similarity index 100%
rename from EOM.TSHotelManager.FormUI/App.config
rename to EOM.TSHotelManagement.FormUI/App.config
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs
similarity index 35%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs
index 24cdbd6508fbfb4ba2ffe09b8abd301bed88f6b9..013268a5ab96e49717886c5f785a0f34c864b0fc 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmAboutUs
     {
@@ -29,49 +29,46 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAboutUs));
-            this.uiRichTextBox1 = new Sunny.UI.UIRichTextBox();
-            this.SuspendLayout();
+            uiRichTextBox1 = new Sunny.UI.UIRichTextBox();
+            SuspendLayout();
             // 
             // uiRichTextBox1
             // 
-            this.uiRichTextBox1.AutoWordSelection = true;
-            this.uiRichTextBox1.BulletIndent = 5;
-            this.uiRichTextBox1.FillColor = System.Drawing.Color.White;
-            this.uiRichTextBox1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.uiRichTextBox1.HideSelection = false;
-            this.uiRichTextBox1.Location = new System.Drawing.Point(6, 40);
-            this.uiRichTextBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.uiRichTextBox1.MinimumSize = new System.Drawing.Size(1, 1);
-            this.uiRichTextBox1.Name = "uiRichTextBox1";
-            this.uiRichTextBox1.Padding = new System.Windows.Forms.Padding(2);
-            this.uiRichTextBox1.Radius = 10;
-            this.uiRichTextBox1.ReadOnly = true;
-            this.uiRichTextBox1.Size = new System.Drawing.Size(539, 180);
-            this.uiRichTextBox1.Style = Sunny.UI.UIStyle.Custom;
-            this.uiRichTextBox1.TabIndex = 0;
-            this.uiRichTextBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.uiRichTextBox1.WordWrap = true;
+            uiRichTextBox1.BulletIndent = 5;
+            uiRichTextBox1.FillColor = Color.White;
+            uiRichTextBox1.Font = new Font("微软雅黑", 12F);
+            uiRichTextBox1.HideSelection = false;
+            uiRichTextBox1.Location = new Point(4, 32);
+            uiRichTextBox1.Margin = new Padding(3, 4, 3, 4);
+            uiRichTextBox1.MinimumSize = new Size(1, 1);
+            uiRichTextBox1.Name = "uiRichTextBox1";
+            uiRichTextBox1.Padding = new Padding(1, 2, 1, 2);
+            uiRichTextBox1.Radius = 10;
+            uiRichTextBox1.ReadOnly = true;
+            uiRichTextBox1.ScrollBarStyleInherited = false;
+            uiRichTextBox1.ShowText = false;
+            uiRichTextBox1.Size = new Size(377, 146);
+            uiRichTextBox1.Style = Sunny.UI.UIStyle.Custom;
+            uiRichTextBox1.TabIndex = 0;
+            uiRichTextBox1.TextAlignment = ContentAlignment.MiddleCenter;
             // 
             // FrmAboutUs
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.ClientSize = new System.Drawing.Size(550, 228);
-            this.Controls.Add(this.uiRichTextBox1);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FrmAboutUs";
-            this.ShowIcon = true;
-            this.ShowTitleIcon = true;
-            this.Style = Sunny.UI.UIStyle.Custom;
-            this.Text = "关于我们";
-            this.Load += new System.EventHandler(this.FrmAboutUs_Load);
-            this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FrmAboutUs_MouseDown);
-            this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.FrmAboutUs_MouseMove);
-            this.ResumeLayout(false);
-
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            BackColor = Color.FromArgb(235, 243, 255);
+            ClientSize = new Size(390, 192);
+            Controls.Add(uiRichTextBox1);
+            Icon = (Icon)resources.GetObject("$this.Icon");
+            Margin = new Padding(2, 2, 2, 2);
+            MaximizeBox = false;
+            MinimizeBox = false;
+            Name = "FrmAboutUs";
+            Text = "关于我们";
+            Load += FrmAboutUs_Load;
+            MouseDown += FrmAboutUs_MouseDown;
+            MouseMove += FrmAboutUs_MouseMove;
+            ResumeLayout(false);
         }
 
         #endregion
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs
index 22519f37f1273cb9a472e11bd4d36987e5aaad16..39f8d511ce3401f692837936c9cc7d3bbc33bf15 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.cs
@@ -21,11 +21,12 @@
  *SOFTWARE.
  *
  */
+using AntdUI;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
-    public partial class FrmAboutUs : UIForm
+    public partial class FrmAboutUs : Window
     {
         public FrmAboutUs()
         {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.resx
similarity index 94%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.resx
index 8dd8416ab4e75ec97028fdcab7771e0b412f7551..4c87f86062214fbf221daa8372f9806bd76be6ca 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAboutUs.resx
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAboutUs.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddAdmin.Designer.cs
similarity index 91%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAddAdmin.Designer.cs
index 84dd4c1df28ab6ecb1259dd149cd17373082267f..72eb842ea81be2f96ea11f7c4dad11b57912179e 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddAdmin.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmAddAdmin
     {
@@ -42,7 +42,7 @@ namespace EOM.TSHotelManager.FormUI
             btnReset = new AntdUI.Button();
             dgvAdminList = new AntdUI.Table();
             pgnPageNavigate = new AntdUI.Pagination();
-            windowBar1 = new AntdUI.WindowBar();
+            pageHeader1 = new AntdUI.PageHeader();
             SuspendLayout();
             // 
             // label1
@@ -54,7 +54,6 @@ namespace EOM.TSHotelManager.FormUI
             label1.TabIndex = 122;
             label1.Text = "账      号";
             label1.TextAlign = ContentAlignment.MiddleCenter;
-            label1.TooltipConfig = null;
             // 
             // txtAccount
             // 
@@ -85,7 +84,6 @@ namespace EOM.TSHotelManager.FormUI
             label2.TabIndex = 124;
             label2.Text = "账号密码";
             label2.TextAlign = ContentAlignment.MiddleCenter;
-            label2.TooltipConfig = null;
             // 
             // label4
             // 
@@ -96,7 +94,6 @@ namespace EOM.TSHotelManager.FormUI
             label4.TabIndex = 126;
             label4.Text = "账户类型";
             label4.TextAlign = ContentAlignment.MiddleCenter;
-            label4.TooltipConfig = null;
             // 
             // cbAccountType
             // 
@@ -127,7 +124,6 @@ namespace EOM.TSHotelManager.FormUI
             label5.TabIndex = 128;
             label5.Text = "真实姓名";
             label5.TextAlign = ContentAlignment.MiddleCenter;
-            label5.TooltipConfig = null;
             // 
             // btnAdd
             // 
@@ -171,17 +167,16 @@ namespace EOM.TSHotelManager.FormUI
             pgnPageNavigate.ValueChanged += pgnPageNavigate_ValueChanged;
             pgnPageNavigate.ShowTotalChanged += pgnPageNavigate_ShowTotalChanged;
             // 
-            // windowBar1
+            // pageHeader1
             // 
-            windowBar1.Font = new Font("Microsoft YaHei UI", 12F);
-            windowBar1.IsMax = false;
-            windowBar1.Location = new Point(2, 3);
-            windowBar1.MaximizeBox = false;
-            windowBar1.MinimizeBox = false;
-            windowBar1.Name = "windowBar1";
-            windowBar1.Size = new Size(999, 40);
-            windowBar1.TabIndex = 133;
-            windowBar1.Text = "添加系统管理员";
+            pageHeader1.Font = new Font("Microsoft YaHei UI", 12F);
+            pageHeader1.Location = new Point(0, 3);
+            pageHeader1.Name = "pageHeader1";
+            pageHeader1.ShowButton = true;
+            pageHeader1.ShowIcon = true;
+            pageHeader1.Size = new Size(1002, 41);
+            pageHeader1.TabIndex = 133;
+            pageHeader1.Text = "系统管理员";
             // 
             // FrmAddAdmin
             // 
@@ -190,7 +185,7 @@ namespace EOM.TSHotelManager.FormUI
             BackColor = Color.FromArgb(235, 243, 255);
             ClientSize = new Size(1001, 623);
             ControlBox = false;
-            Controls.Add(windowBar1);
+            Controls.Add(pageHeader1);
             Controls.Add(pgnPageNavigate);
             Controls.Add(dgvAdminList);
             Controls.Add(btnReset);
@@ -235,6 +230,7 @@ namespace EOM.TSHotelManager.FormUI
         private AntdUI.Button btnReset;
         private AntdUI.Table dgvAdminList;
         private AntdUI.Pagination pgnPageNavigate;
-        private AntdUI.WindowBar windowBar1;
+        private AntdUI.PageHeader pageHeader1;
+        //private AntdUI.WindowBar windowBar1;
     }
 }
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddAdmin.cs
similarity index 95%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAddAdmin.cs
index f79d80b2ff9c833ca96f50f058495f2662bcfc52..de3e626084e0c140ff4d3013c82d4b1c4045d16b 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddAdmin.cs
@@ -22,12 +22,12 @@
  *
  */
 using AntdUI;
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.Common.Util;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.Common.Util;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmAddAdmin : Window
     {
@@ -52,7 +52,7 @@ namespace EOM.TSHotelManager.FormUI
         {
             pgnPageNavigate.PageSizeOptions = new int[] { 10, 30, 50, 100 };
             var dataCount = 0;
-            dgvAdminList.Spin("正在加载中...", () =>
+            dgvAdminList.Spin("正在加载中......", config =>
             {
                 TableComHelper tableComHelper = new TableComHelper();
                 dgvAdminList.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns<Admin>());
@@ -136,7 +136,7 @@ namespace EOM.TSHotelManager.FormUI
         private void pgnPageNavigate_ValueChanged(object sender, PagePageEventArgs e)
         {
             var dataCount = 0;
-            dgvAdminList.Spin("正在加载中...", () =>
+            dgvAdminList.Spin("正在加载中...", config =>
             {
                 dgvAdminList.DataSource = GetPageData(e.Current, e.PageSize, ref dataCount);
                 pgnPageNavigate.PageSize = 10;
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddAdmin.resx
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAddAdmin.resx
index 85ebd30e5775a2a052a501354b20d0803a1fcc65..9f8c763d6ce0a2e1b554833bc8778613541ccac3 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddAdmin.resx
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddAdmin.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddRoom.Designer.cs
similarity index 92%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAddRoom.Designer.cs
index 759b4d13c1e8ea51d216fd8eedb7005da623f437..7bdf9d9e6f03080e1b97e362334729e04b52836a 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddRoom.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmAddRoom
     {
@@ -43,7 +43,7 @@
             txtDeposit = new AntdUI.InputNumber();
             label10 = new AntdUI.Label();
             btnAddRoom = new AntdUI.Button();
-            windowBar1 = new AntdUI.WindowBar();
+            //windowBar1 = new AntdUI.WindowBar();
             SuspendLayout();
             // 
             // flpRoom
@@ -177,15 +177,15 @@
             // 
             // windowBar1
             // 
-            windowBar1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
-            windowBar1.Icon = (System.Drawing.Image)resources.GetObject("windowBar1.Icon");
-            windowBar1.Location = new System.Drawing.Point(1, 3);
-            windowBar1.MaximizeBox = false;
-            windowBar1.MinimizeBox = false;
-            windowBar1.Name = "windowBar1";
-            windowBar1.Size = new System.Drawing.Size(999, 40);
-            windowBar1.TabIndex = 137;
-            windowBar1.Text = "新增客房";
+            //windowBar1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
+            //windowBar1.Icon = (System.Drawing.Image)resources.GetObject("windowBar1.Icon");
+            //windowBar1.Location = new System.Drawing.Point(1, 3);
+            //windowBar1.MaximizeBox = false;
+            //windowBar1.MinimizeBox = false;
+            //windowBar1.Name = "windowBar1";
+            //windowBar1.Size = new System.Drawing.Size(999, 40);
+            //windowBar1.TabIndex = 137;
+            //windowBar1.Text = "新增客房";
             // 
             // FrmAddRoom
             // 
@@ -194,7 +194,7 @@
             BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             ClientSize = new System.Drawing.Size(1001, 623);
             ControlBox = false;
-            Controls.Add(windowBar1);
+            //Controls.Add(windowBar1);
             Controls.Add(btnAddRoom);
             Controls.Add(txtDeposit);
             Controls.Add(label10);
@@ -230,6 +230,6 @@
         private AntdUI.InputNumber txtDeposit;
         private AntdUI.Label label10;
         private AntdUI.Button btnAddRoom;
-        private AntdUI.WindowBar windowBar1;
+        //private AntdUI.WindowBar windowBar1;
     }
 }
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddRoom.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAddRoom.cs
index dbd1e479d3573a59149c56161775f38d2dc226c9..b4972105c6d740adb8bce8cb01a69298a1660ce6 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddRoom.cs
@@ -22,13 +22,13 @@
  *
  */
 using AntdUI;
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.Common.Util;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.Common.Util;
 using jvncorelib.EntityLib;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmAddRoom : Window
     {
@@ -48,7 +48,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "roomType", Convert.ToString(cboRoomType.SelectedValue.ToString())}
             };
-            result = HttpHelper.Request("RoomType/SelectRoomTypeByType", null, dic);
+            result = HttpHelper.Request("RoomType/SelectRoomTypeByType", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomTypeByType+接口服务异常，请提交Issue或尝试更新版本！");
@@ -109,7 +109,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "isDelete","0"}
             };
-            result = HttpHelper.Request("RoomType/SelectRoomTypesAll", null, dic);
+            result = HttpHelper.Request("RoomType/SelectRoomTypesAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -117,6 +117,7 @@ namespace EOM.TSHotelManager.FormUI
             }
             cboRoomType.Items.AddRange(HttpHelper.JsonToList<RoomType>(result.message).Select(a => new SelectItem(a.RoomName, a.Roomtype)).ToArray());
             cboRoomType.SelectedIndex = 0;
+
         }
 
         public void LoadRoom()
@@ -145,7 +146,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "roomTypeId",cboRoomType.SelectedValue.ToString()}
             };
-            result = HttpHelper.Request("RoomType/SelectRoomTypeByType", null, dic);
+            result = HttpHelper.Request("RoomType/SelectRoomTypeByType", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomTypeByType+接口服务异常，请提交Issue或尝试更新版本！");
@@ -165,7 +166,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "no", RoomNo }
             };
-            result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic);
+            result = HttpHelper.Request("Room/SelectRoomByRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAddRoom.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAddRoom.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAddRoom.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAdminManagement.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAdminManagement.Designer.cs
index dd3d0500e9b209dd9c4b0d1ed299bb35eaff8cc8..9b9dbc5196a89562f2613900d435c0e766fd2d2b 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAdminManagement.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmAdminManager
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAdminManagement.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAdminManagement.cs
index a378740663ecb85943ccc66c616189a3aa3a61c9..ac6fa7c7c03db33b083b42ad99072b6e734c0d91 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAdminManagement.cs
@@ -21,11 +21,11 @@
  *SOFTWARE.
  *
  */
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmAdminManager : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAdminManagement.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAdminManager.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAdminManagement.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAuthority.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAuthority.Designer.cs
index 654e8ce3cad84268ddfdfb14b6b44a5cd0de6752..50c88bfa80bbd104961d57dde0253b7a6ca4c676 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAuthority.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmAuthority
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAuthority.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAuthority.cs
index ea6f0f72448dbb7fa192fd60f9937d871a3ec50e..8d30c1cb7676d18a4faa8e328d5bf672dae82f2a 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAuthority.cs
@@ -21,12 +21,12 @@
  *SOFTWARE.
  *
  */
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using jvncorelib.EntityLib;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmAuthority : UIForm
     {
@@ -40,7 +40,6 @@ namespace EOM.TSHotelManager.FormUI
 
         private void FrmAuthority_Load(object sender, EventArgs e)
         {
-
         }
 
         public void LoadAdminInfo()
@@ -49,7 +48,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "AdminAccount",txtAccount.Text.Trim() }
             };
-            result = HttpHelper.Request("Admin/GetAdminInfoByAdminAccount", null, dic);
+            result = HttpHelper.Request("Admin/GetAdminInfoByAdminAccount", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("GetAdminInfoByAdminAccount+接口服务异常，请提交Issue或尝试更新版本！");
@@ -124,7 +123,7 @@ namespace EOM.TSHotelManager.FormUI
                 { "AdminAccount",txtAccount.Text.Trim() }
             };
             var admin = new Admin { AdminAccount = txtAccount.Text.Trim() };
-            result = HttpHelper.Request("Module/GetAllModuleByAdmin", HttpHelper.ModelToJson(admin), null);
+            result = HttpHelper.Request("Module/GetAllModuleByAdmin", HttpHelper.ModelToJson(admin));
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("GetAllModuleByAdmin+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmAuthority.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmAuthority.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmAuthority.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmBaseManagement.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmBaseManagement.Designer.cs
index 4fad7734027a6a7aa34f1af72dd67f9df863be60..975d12d563f874632d366a3af3f66238a2901926 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmBaseManagement.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmBaseManager
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmBaseManagement.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmBaseManagement.cs
index 128498348a391f6258723aef3e53599a26a6ea81..e9e7c293e35d5ed4d9541b5526f068bccf394148 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmBaseManagement.cs
@@ -23,7 +23,7 @@
  */
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmBaseManager : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmBaseManagement.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmBaseManager.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmBaseManagement.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCash.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCash.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCash.Designer.cs
index f82d86d0c44527fb44b3f1829337f492053231b0..8b9be9af731195e83e56d09567dff2444c220595 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCash.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmCash
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCash.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCash.cs
index 28842d0a25707856b91268faf31108b96a44cd23..66564151cb3eeb2cf2fec4946b4ed821f59769d3 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCash.cs
@@ -21,12 +21,12 @@
  *SOFTWARE.
  *
  */
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.Common.Util;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.Common.Util;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmCash : UIForm
     {
@@ -68,7 +68,6 @@ namespace EOM.TSHotelManager.FormUI
                 btnOK.Enabled = false;
                 btnOK.Text = "权限不足";
             }
-
         }
 
         private void LoadCashInfo()
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCash.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCash.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCash.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCash.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs
index 407191b016bcf578cceabab10d24142ce98a89f9..17f8cfdd4f32e746ec56ea6c6738512a2d296cca 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeAdminPwd.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmChangeAdminPwd
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeAdminPwd.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeAdminPwd.cs
index 5dc04e72954a98bb403dd42ff8c9c1b3abe6da53..1fb3f981b8c35456e789266818042aa6919f0f89 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeAdminPwd.cs
@@ -21,13 +21,13 @@
  *SOFTWARE.
  *
  */
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using jvncorelib.EntityLib;
 using Sunny.UI;
 using System.Text.RegularExpressions;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmChangeAdminPwd : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeAdminPwd.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChangeAdminPwd.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeAdminPwd.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangePosition.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChangePosition.Designer.cs
index 1e611cfcea9b0c2e0a18b78c342f490bac921883..fcb9f7218e7feb7af4fc903a780ccfeb67c8fd19 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangePosition.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmChangePosition
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangePosition.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChangePosition.cs
index 1e6c58f34521b9f0234d447d45e56341a5fdbe7f..a6cfbf314bbeeba9004a45dde8ab141959d3189f 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangePosition.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmChangePosition : UIForm
     {
@@ -53,7 +53,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "delete_mk","0"}
             };
-            result = HttpHelper.Request("Base/SelectPositionAll", null, dic);
+            result = HttpHelper.Request("Base/SelectPositionAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangePosition.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChangePosition.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChangePosition.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.Designer.cs
index c67345fc510f4d35eca2fb2c8de60bca78cc8e74..68f6f743ea1a600d4310869a8653ef97dcd2d773 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmChangeRoom
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs
similarity index 94%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs
index fcdaaa41ac72dbe75d96e9ffdcf2123eb8a1f6e4..a7b23a4febbdca15e3aa7d9c3f2f9add327bf0fc 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.cs
@@ -22,12 +22,13 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 using System.Transactions;
+using EOM.TSHotelManagement.Shared;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmChangeRoom : UIForm
     {
@@ -66,7 +67,7 @@ namespace EOM.TSHotelManager.FormUI
                 { "no",rno}
             };
 
-            result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic);
+            result = HttpHelper.Request("Room/SelectRoomByRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -82,10 +83,10 @@ namespace EOM.TSHotelManager.FormUI
                 datains_usr = LoginInfo.WorkerNo
             };
             dic = new Dictionary<string, string>()
-                {
-                    { "roomno",rno}
-                };
-            result = HttpHelper.Request("Room/DayByRoomNo", null, dic);
+            {
+                { "roomno",rno}
+            };
+            result = HttpHelper.Request("Room/DayByRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -99,13 +100,13 @@ namespace EOM.TSHotelManager.FormUI
                 SpendName = "居住" + rno + "共" + Convert.ToInt32(result.message) + "天",
                 SpendAmount = Convert.ToInt32(result.message),
                 CustoNo = ucRoom.co_CustoNo,
-                SpendPrice = Convert.ToDecimal(sum),
+                SpendPrice = room.RoomMoney,
                 SpendMoney = Convert.ToDecimal(sum),
                 SpendTime = Convert.ToDateTime(Convert.ToDateTime(DateTime.Now).ToString("yyyy-MM-dd HH:mm:ss")),
                 MoneyState = SpendConsts.UnSettle,
             };
 
-            result = HttpHelper.Request("Room​/UpdateRoomInfo", HttpHelper.ModelToJson(checkInRoom), null);
+            result = HttpHelper.Request("Room​/UpdateRoomInfo", HttpHelper.ModelToJson(checkInRoom));
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("UpdateRoomInfo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -116,7 +117,7 @@ namespace EOM.TSHotelManager.FormUI
                 {
                     { "room",rno}
                 };
-            result = HttpHelper.Request("Room​/UpdateRoomByRoomNo", null, dic);
+            result = HttpHelper.Request("Room​/UpdateRoomByRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("UpdateRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -127,7 +128,7 @@ namespace EOM.TSHotelManager.FormUI
                 {
                     { "No",rno}
                 };
-            result = HttpHelper.Request("Spend​/SelectSpendByCustoNo", null, dic);
+            result = HttpHelper.Request("Spend​/SelectSpendByCustoNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectSpendByCustoNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -179,7 +180,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "no",str}
             };
-            result = HttpHelper.Request("RoomType/SelectRoomTypeByRoomNo", null, dic);
+            result = HttpHelper.Request("RoomType/SelectRoomTypeByRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomTypeByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChangeRoom.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChangeRoom.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChart.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChart.Designer.cs
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChart.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChart.Designer.cs
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChart.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChart.cs
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChart.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChart.cs
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmChart.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmChart.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmChart.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmChart.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.Designer.cs
index a6e1a11c88df7493ef7806744f298f6d9fcfd48b..232921b154d0aa4f3c3276ac650105a2fcea7b88 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmCheckIn
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs
index 798251a35afcf037f85d7c61e236497e53cbf0ac..6a10da49e37fb11b644d133a0748dfb4ac067535 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.cs
@@ -23,12 +23,12 @@
  */
 
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 using System.Transactions;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmCheckIn : UIEditForm
     {
@@ -44,14 +44,14 @@ namespace EOM.TSHotelManager.FormUI
             txtRoomNo.Text = ucRoom.rm_RoomNo;
             Dictionary<string, string> pairs = new Dictionary<string, string>();
             pairs.Add("no", txtRoomNo.Text.Trim()!);
-            result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, pairs);
+            result = HttpHelper.Request("Room/SelectRoomByRoomNo", pairs);
             if (result.statusCode != 200)
             {
                 UIMessageTip.ShowError("SelectRoomByRoomNo+接口服务异常，请提交issue");
                 return;
             }
             Room r = HttpHelper.JsonToModel<Room>(result.message!)!;
-            result = HttpHelper.Request("RoomType/SelectRoomTypeByRoomNo", null, pairs);
+            result = HttpHelper.Request("RoomType/SelectRoomTypeByRoomNo", pairs);
             if (result.statusCode != 200)
             {
                 UIMessageTip.ShowError("SelectRoomTypeByRoomNo+接口服务异常，请提交issue");
@@ -63,7 +63,7 @@ namespace EOM.TSHotelManager.FormUI
             txtRoomPosition.Text = r.RoomPosition;
             txtState.Text = r.RoomState;
             txtDeposit.Text = r.RoomDeposit.ToString();
-            result = HttpHelper.Request("Custo/SelectCustoAll", null, null);
+            result = HttpHelper.Request("Custo/SelectCustoAll");
             if (result.statusCode != 200)
             {
                 UIMessageTip.ShowError("SelectCustoAll+接口服务异常，请提交issue");
@@ -121,7 +121,7 @@ namespace EOM.TSHotelManager.FormUI
         private void ValidateAndUpdateCustomerInfo()
         {
             // 获取会员规则列表
-            var result = HttpHelper.Request("VipRule/SelectVipRuleList", null, null);
+            var result = HttpHelper.Request("VipRule/SelectVipRuleList");
             if (result.statusCode != 200)
             {
                 throw new Exception("SelectVipRuleList+接口服务异常");
@@ -134,7 +134,7 @@ namespace EOM.TSHotelManager.FormUI
 
             // 查询用户消费记录
             var user = new Dictionary<string, string> { { "custoNo", txtCustoNo.Text.Trim() } };
-            result = HttpHelper.Request("Spend/SeletHistorySpendInfoAll", null, user);
+            result = HttpHelper.Request("Spend/SeletHistorySpendInfoAll", user);
             if (result.statusCode != 200)
             {
                 throw new Exception("SeletHistorySpendInfoAll+接口服务异常");
@@ -157,7 +157,7 @@ namespace EOM.TSHotelManager.FormUI
                 { "custoNo", txtCustoNo.Text.Trim() },
                 { "userType", new_type.ToString() }
             };
-                    result = HttpHelper.Request("Custo/UpdCustomerTypeByCustoNo", null, user);
+                    result = HttpHelper.Request("Custo/UpdCustomerTypeByCustoNo", user);
                     if (result.statusCode != 200)
                     {
                         throw new Exception("UpdCustomerTypeByCustoNo+接口服务异常");
@@ -169,7 +169,7 @@ namespace EOM.TSHotelManager.FormUI
             if (!string.IsNullOrEmpty(txtCustoNo.Text))
             {
                 user = new Dictionary<string, string> { { "CustoNo", txtCustoNo.Text.Trim() } };
-                result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo", null, user);
+                result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo", user);
                 if (result.statusCode != 200)
                 {
                     throw new Exception("SelectCardInfoByCustoNo+接口服务异常");
@@ -186,7 +186,7 @@ namespace EOM.TSHotelManager.FormUI
         {
             Dictionary<string, string> user = new Dictionary<string, string>();
             user.Add("CustoNo", txtCustoNo.Text.Trim());
-            result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo", null, user);
+            result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo", user);
             if (result.statusCode != 200)
             {
                 UIMessageTip.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交issue");
@@ -204,7 +204,7 @@ namespace EOM.TSHotelManager.FormUI
                         RoomNo = txtRoomNo.Text,
                         datachg_usr = LoginInfo.WorkerNo
                     };
-                    result = HttpHelper.Request("Room/UpdateRoomInfo", HttpHelper.ModelToJson(r), null);
+                    result = HttpHelper.Request("Room/UpdateRoomInfo", HttpHelper.ModelToJson(r));
                     if (result.statusCode != 200)
                     {
                         UIMessageTip.ShowError("UpdateRoomInfo+接口服务异常，请提交issue");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCheckIn.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckIn.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckList.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckList.Designer.cs
index 155439673570617d5196da32bf426be97a17f8a8..e20fda95e3878a7bae92e585466d5fe73250e0e8 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckList.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmCheckList
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckList.cs
similarity index 93%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckList.cs
index d93477875be2e7e922339adb26cbe5c540905520..b17010d909622074abd65f3e38c1efd79aaa5e6d 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckList.cs
@@ -23,11 +23,11 @@
  */
 
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmCheckList : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckList.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCheckList.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckList.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.Designer.cs
index 32f59213dedb7503a4e47423102e930a5c4cce26..7e20aba440ac283c74450c4eeac196e6ad00c57d 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmCheckOutForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs
index c04d876f62bc1bd04e434b0701ae9090f29405e3..e7bb9b08f6c02af521b8f3114f7b31a228a017cf 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.cs
@@ -22,12 +22,12 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 using System.Transactions;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmCheckOutForm : UIForm
     {
@@ -42,10 +42,12 @@ namespace EOM.TSHotelManager.FormUI
         public static string co_CustoType;
         public static string co_CustoID;
         public static HydroelectricPower w;
+        private LoadingProgress _loadingProgress;
 
-        public FrmCheckOutForm()
+        public FrmCheckOutForm(LoadingProgress loadingProgress)
         {
             InitializeComponent();
+            _loadingProgress = loadingProgress;
         }
 
         ResponseMsg result = null;
@@ -133,7 +135,7 @@ namespace EOM.TSHotelManager.FormUI
                 { "no",txtRoomNo.Text.ToString()}
             };
 
-            result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic);
+            result = HttpHelper.Request("Room/SelectRoomByRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -154,7 +156,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "roomno",txtRoomNo.Text}
             };
-            result = HttpHelper.Request("Room/DayByRoomNo", null, dic);
+            result = HttpHelper.Request("Room/DayByRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("DayByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -180,7 +182,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "CustoNo",CustoNo.Text.ToString()}
             };
-            result = HttpHelper.Request("Custo​/SelectCardInfoByCustoNo", null, dic);
+            result = HttpHelper.Request("Custo​/SelectCardInfoByCustoNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -213,7 +215,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "RoomNo",RoomNo}
             };
-            result = HttpHelper.Request("Spend/SelectSpendInfoRoomNo", null, dic);
+            result = HttpHelper.Request("Spend/SelectSpendInfoRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectSpendInfoRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -233,7 +235,7 @@ namespace EOM.TSHotelManager.FormUI
                     { "roomno",RoomNo},
                     { "custono",CustoNo.Text.ToString()}
                 };
-                result = HttpHelper.Request("Spend/SelectMoneyByRoomNoAndTime", null, dic);
+                result = HttpHelper.Request("Spend/SelectMoneyByRoomNoAndTime", dic);
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("SelectMoneyByRoomNoAndTime+接口服务异常，请提交Issue或尝试更新版本！");
@@ -249,7 +251,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "roomno",txtRoomNo.Text.Trim()}
             };
-            result = HttpHelper.Request("HydroelectricPower/ListWtiInfoByRoomNo", null, dic);
+            result = HttpHelper.Request("HydroelectricPower/ListWtiInfoByRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("ListWtiInfoByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -298,6 +300,11 @@ namespace EOM.TSHotelManager.FormUI
 
             }
 
+            if (_loadingProgress != null)
+            {
+                _loadingProgress.Close();
+            }
+
         }
         #endregion
 
@@ -347,7 +354,7 @@ namespace EOM.TSHotelManager.FormUI
                     {
                         { "no",txtRoomNo.Text}
                     };
-                    result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic);
+                    result = HttpHelper.Request("Room/SelectRoomByRoomNo", dic);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -361,7 +368,7 @@ namespace EOM.TSHotelManager.FormUI
                         {
                             { "room",txtRoomNo.Text}
                         };
-                        result = HttpHelper.Request("Room/UpdateRoomByRoomNo", null, dic);
+                        result = HttpHelper.Request("Room/UpdateRoomByRoomNo", dic);
                         if (result.statusCode != 200)
                         {
                             UIMessageBox.ShowError("UpdateRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -398,7 +405,7 @@ namespace EOM.TSHotelManager.FormUI
                             { "roomno",txtRoomNo.Text},
                             { "checktime",checktime}
                         };
-                        result = HttpHelper.Request("Spend​/UpdateMoneyState", null, dic);
+                        result = HttpHelper.Request("Spend​/UpdateMoneyState", dic);
                         if (result.statusCode != 200)
                         {
                             UIMessageBox.ShowError("UpdateMoneyState+接口服务异常，请提交Issue或尝试更新版本！");
@@ -410,7 +417,7 @@ namespace EOM.TSHotelManager.FormUI
                             {
                                 { "room",txtRoomNo.Text}
                             };
-                            result = HttpHelper.Request("Room/UpdateRoomByRoomNo", null, dic);
+                            result = HttpHelper.Request("Room/UpdateRoomByRoomNo", dic);
                             if (result.statusCode != 200)
                             {
                                 UIMessageBox.ShowError("UpdateMoneyState+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCheckOutForm.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCheckOutForm.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoManagement.Designer.cs
similarity index 87%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoManagement.Designer.cs
index 8e5380136888129f3de553d4609ada4c138e7394..38e084de779fc41cb9668858a287bbc6a4726015 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoManagement.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmCustoManager
     {
@@ -33,7 +33,6 @@
             tsmiCustoNo = new ToolStripMenuItem();
             dgvCustomerList = new AntdUI.Table();
             btnPg = new AntdUI.Pagination();
-            windowBar1 = new AntdUI.WindowBar();
             txtCustoNo = new AntdUI.Input();
             txtCustoName = new AntdUI.Input();
             label2 = new AntdUI.Label();
@@ -43,7 +42,6 @@
             btnExport = new AntdUI.Button();
             btnUpdate = new AntdUI.Button();
             cbOnlyVip = new AntdUI.Checkbox();
-            cbExportAll = new AntdUI.Checkbox();
             divider1 = new AntdUI.Divider();
             cmsCustoManager.SuspendLayout();
             SuspendLayout();
@@ -81,25 +79,12 @@
             btnPg.Name = "btnPg";
             btnPg.PageSize = 15;
             btnPg.ShowSizeChanger = true;
-            btnPg.Size = new Size(405, 31);
+            btnPg.Size = new Size(530, 31);
             btnPg.TabIndex = 133;
             btnPg.Total = 100;
             btnPg.ValueChanged += btnPg_ValueChanged;
             btnPg.ShowTotalChanged += btnPg_ShowTotalChanged;
             // 
-            // windowBar1
-            // 
-            windowBar1.Font = new Font("Microsoft YaHei UI", 12F);
-            windowBar1.Icon = (Image)resources.GetObject("windowBar1.Icon");
-            windowBar1.IsMax = false;
-            windowBar1.Location = new Point(4, 3);
-            windowBar1.MaximizeBox = false;
-            windowBar1.MinimizeBox = false;
-            windowBar1.Name = "windowBar1";
-            windowBar1.Size = new Size(999, 40);
-            windowBar1.TabIndex = 138;
-            windowBar1.Text = "客户信息管理";
-            // 
             // txtCustoNo
             // 
             txtCustoNo.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
@@ -190,23 +175,13 @@
             // 
             cbOnlyVip.AutoCheck = true;
             cbOnlyVip.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            cbOnlyVip.Location = new Point(422, 538);
+            cbOnlyVip.Location = new Point(540, 538);
             cbOnlyVip.Name = "cbOnlyVip";
             cbOnlyVip.Size = new Size(120, 23);
             cbOnlyVip.TabIndex = 147;
             cbOnlyVip.Text = "仅查看会员";
             cbOnlyVip.CheckedChanged += cbOnlyVip_CheckedChanged;
             // 
-            // cbExportAll
-            // 
-            cbExportAll.AutoCheck = true;
-            cbExportAll.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
-            cbExportAll.Location = new Point(559, 538);
-            cbExportAll.Name = "cbExportAll";
-            cbExportAll.Size = new Size(108, 23);
-            cbExportAll.TabIndex = 148;
-            cbExportAll.Text = "导出全部";
-            // 
             // divider1
             // 
             divider1.ColorSplit = Color.Blue;
@@ -224,7 +199,6 @@
             ClientSize = new Size(1005, 623);
             ControlBox = false;
             Controls.Add(divider1);
-            Controls.Add(cbExportAll);
             Controls.Add(cbOnlyVip);
             Controls.Add(btnUpdate);
             Controls.Add(btnExport);
@@ -234,13 +208,13 @@
             Controls.Add(label2);
             Controls.Add(txtCustoName);
             Controls.Add(txtCustoNo);
-            Controls.Add(windowBar1);
             Controls.Add(btnPg);
             Controls.Add(dgvCustomerList);
             Icon = (Icon)resources.GetObject("$this.Icon");
             MaximizeBox = false;
             MinimizeBox = false;
             Name = "FrmCustoManager";
+            Resizable = false;
             Text = "客户信息管理";
             Load += FrmCustoManager_Load;
             cmsCustoManager.ResumeLayout(false);
@@ -252,7 +226,6 @@
         private System.Windows.Forms.ToolStripMenuItem tsmiCustoNo;
         private AntdUI.Table dgvCustomerList;
         private AntdUI.Pagination btnPg;
-        private AntdUI.WindowBar windowBar1;
         private AntdUI.Input txtCustoNo;
         private AntdUI.Input txtCustoName;
         private AntdUI.Label label2;
@@ -262,7 +235,6 @@
         private AntdUI.Button btnExport;
         private AntdUI.Button btnUpdate;
         private AntdUI.Checkbox cbOnlyVip;
-        private AntdUI.Checkbox cbExportAll;
         private AntdUI.Divider divider1;
     }
 }
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoManagement.cs
similarity index 66%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoManagement.cs
index bc2d0af53860726a5c03768be55947fe7b9f3807..a0688e2eb8df79374634bf9e65d6d7cbe66d659d 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoManagement.cs
@@ -23,12 +23,12 @@
  */
 
 using AntdUI;
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using jvncorelib.EntityLib;
 using System.Data;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmCustoManager : Window
     {
@@ -69,7 +69,7 @@ namespace EOM.TSHotelManager.FormUI
         {
             var dataCount = 0;
             btnPg.PageSizeOptions = new int[] { 15, 30, 50, 100 };
-            dgvCustomerList.Spin("正在加载中...", () =>
+            dgvCustomerList.Spin("正在加载中...", config =>
             {
                 TableComHelper tableComHelper = new TableComHelper();
                 dgvCustomerList.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns<Custo>());
@@ -94,7 +94,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 dic.Add("onlyVip", onlyVip.ToString());
             }
-            result = HttpHelper.Request("Custo/SelectCustoAll", null, dic);
+            result = HttpHelper.Request("Custo/SelectCustoAll", dic);
             if (result.statusCode != 200)
             {
                 AntdUI.Message.error(this, "SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -114,39 +114,6 @@ namespace EOM.TSHotelManager.FormUI
 
         #endregion
 
-        /// <summary>
-        /// 将DataGridView里的数据转换成DataTable
-        /// </summary>
-        /// <param name="dgv"></param>
-        /// <returns></returns>
-        public DataTable ConvertDataGridViewToDataTable(DataGridView dgv)
-        {
-            // 创建一个新的DataTable对象
-            DataTable dt = new DataTable();
-
-            // 为DataTable添加列，列名与DataGridView的列名相同
-            foreach (DataGridViewColumn column in dgv.Columns)
-            {
-                dt.Columns.Add(column.Name, column.ValueType);
-            }
-
-            // 遍历DataGridView的每一行，并将其添加到DataTable中
-            foreach (DataGridViewRow row in dgv.Rows)
-            {
-                if (!row.IsNewRow) // 排除新行（未绑定的行）
-                {
-                    DataRow dataRow = dt.NewRow();
-                    foreach (DataGridViewCell cell in row.Cells)
-                    {
-                        dataRow[cell.OwningColumn.Name] = cell.Value;
-                    }
-                    dt.Rows.Add(dataRow);
-                }
-            }
-
-            return dt;
-        }
-
         private void tsmiCustoNo_Click(object sender, EventArgs e)
         {
             if (!cm_CustoNo.IsNullOrEmpty())
@@ -175,7 +142,7 @@ namespace EOM.TSHotelManager.FormUI
                         { "CustoName",  txtCustoName.Text.Trim() }
                     };
                 }
-                result = HttpHelper.Request("Custo/SelectCustoByInfo", null, dic);
+                result = HttpHelper.Request("Custo/SelectCustoByInfo", dic);
                 if (result.statusCode != 200)
                 {
                     AntdUI.Message.error(this, "SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -201,7 +168,7 @@ namespace EOM.TSHotelManager.FormUI
             TableComHelper tableComHelper = new TableComHelper();
             listTableSource = tableComHelper.ConvertToAntdItems(custos.listSource);
 
-            dgvCustomerList.Spin("正在加载中...", () =>
+            dgvCustomerList.Spin("正在加载中...", config =>
             {
                 dgvCustomerList.DataSource = listTableSource;
             }, () =>
@@ -221,55 +188,47 @@ namespace EOM.TSHotelManager.FormUI
 
         private void btnExport_Click(object sender, EventArgs e)
         {
-            //// 调用之前定义的导出方法
-            //ExportHelper exportHelper = new ExportHelper();
-            //SaveFileDialog saveFileDialog = new SaveFileDialog();
-            //// 设置保存对话框的属性
-            //saveFileDialog.Filter = "2003~2007工作表*.xls|*.xls|2010及以上版本工作表*.xlsx|*.xlsx";
-            //saveFileDialog.Title = cbExportAll.Checked ? "导出Excel文件(导出全部)" : "导出Excel文件(导出当前页)";
-            //saveFileDialog.FileName = Convert.ToDateTime(DateTime.Now).ToString("yyyyMMddHHmmss") + "_" + "客户列表"; // 默认文件名
-            //saveFileDialog.CheckPathExists = true; // 检查目录是否存在
-
-            //if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            //{
-            //    // 用户确认保存，获取选择的文件路径
-            //    string filePath = saveFileDialog.FileName;
-
-            //    try
-            //    {
-            //        if (cbExportAll.Checked)
-            //        {
-            //            dic = new Dictionary<string, string>()
-            //            {
-            //                { "pageIndex",null},
-            //                { "pageSize",null}
-            //            };
-            //            ResponseMsg response = HttpHelper.Request("Custo/SelectCustoAll", null, dic);
-            //            if (response.statusCode != 200)
-            //            {
-            //                AntdUI.Message.error(this,"SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！");
-            //                return;
-            //            }
-            //            OSelectAllDto<Custo> custos = HttpHelper.JsonToModel<OSelectAllDto<Custo>>(response.message);
-            //            exportHelper.ExportDataToExcel(custos.listSource, filePath, new List<string> { "CustoSex", "PassportType", "CustoID", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date" });
-            //        }
-            //        else
-            //        {
-            //            exportHelper.ExportDataTableToExcel(ConvertDataGridViewToDataTable(dgvCustomerList.CopyData(dgvCustomerList.SelectedIndex), filePath, new List<string> { "Column1", "Column2", "Column3", "Column4" });
-            //        }
-            //        AntdUI.Message.success(this,"导出成功！");
-            //        System.Diagnostics.Process.Start("Explorer.exe", filePath);
-            //        #region 获取添加操作日志所需的信息
-            //        RecordHelper.Record(LoginInfo.WorkerClub + LoginInfo.WorkerName + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "导出了" + "后台用户信息!", 3);
-            //        #endregion
-            //    }
-            //    catch (Exception ex)
-            //    {
-            //        // 处理可能发生的任何错误
-            //        AntdUI.Message.error(this, $"导出失败: {ex.Message}");
-            //    }
-            //}
-            //// 如果用户取消了保存，则不执行任何操作
+            // 调用之前定义的导出方法
+            ExportHelper exportHelper = new ExportHelper();
+            SaveFileDialog saveFileDialog = new SaveFileDialog();
+            // 设置保存对话框的属性
+            saveFileDialog.Filter = "2003~2007工作表*.xls|*.xls|2010及以上版本工作表*.xlsx|*.xlsx";
+            saveFileDialog.Title = "导出Excel文件";
+            saveFileDialog.FileName = Convert.ToDateTime(DateTime.Now).ToString("yyyyMMddHHmmss") + "_" + "客户列表"; // 默认文件名
+            saveFileDialog.CheckPathExists = true; // 检查目录是否存在
+
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                // 用户确认保存，获取选择的文件路径
+                string filePath = saveFileDialog.FileName;
+
+                try
+                {
+                    dic = new Dictionary<string, string>()
+                    {
+                        { "pageIndex",null},
+                        { "pageSize",null}
+                    };
+                    ResponseMsg response = HttpHelper.Request("Custo/SelectCustoAll", dic);
+                    if (response.statusCode != 200)
+                    {
+                        AntdUI.Message.error(this, "SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！");
+                        return;
+                    }
+                    OSelectAllDto<Custo> custos = HttpHelper.JsonToModel<OSelectAllDto<Custo>>(response.message);
+                    exportHelper.ExportDataToExcel(custos.listSource, filePath, new List<string> { "CustoSex", "PassportType", "CustoID", "CustoType", "delete_mk", "datains_usr", "datains_date", "datachg_usr", "datachg_date" });
+
+                    AntdUI.Message.success(this, "导出成功！");
+                    System.Diagnostics.Process.Start("Explorer.exe", filePath);
+                    #region 获取添加操作日志所需的信息
+                    RecordHelper.Record(LoginInfo.WorkerClub + LoginInfo.WorkerName + LoginInfo.WorkerPosition + LoginInfo.WorkerName + "于" + Convert.ToDateTime(DateTime.Now) + "导出了" + "后台用户信息!", 3);
+                    #endregion
+                }
+                catch (Exception ex)
+                {
+                    AntdUI.Message.error(this, $"导出失败: {ex.Message}");
+                }
+            }
         }
 
         private void btnUpdate_Click(object sender, EventArgs e)
@@ -309,9 +268,9 @@ namespace EOM.TSHotelManager.FormUI
         private void btnPg_ValueChanged(object sender, PagePageEventArgs e)
         {
             var dataCount = 0;
-            dgvCustomerList.Spin("正在加载中...", () =>
+            dgvCustomerList.Spin("正在加载中...", config =>
             {
-                dgvCustomerList.DataSource = GetPageData(e.Current, e.PageSize, ref dataCount);
+                dgvCustomerList.DataSource = GetPageData(e.Current, e.PageSize, ref dataCount,cbOnlyVip.Checked);
                 btnPg.Total = dataCount;
             }, () =>
             {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoManagement.resx
similarity index 84%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoManagement.resx
index 284de1a7ebd6c5b1ff90ee04f89d98ec58a38360..750c0dd07b214549e9fa026398d6c5859c603342 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoManager.resx
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoManagement.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -124,23 +124,22 @@
   <data name="windowBar1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAA6dJREFUWEe1l1mIT1Ecx8eaZYhhJEsoSXggiWR7IKUsWceaZE9IdgmJB6UGCSnk
-        QZYshRKDIllSI9my5sGDnXggzPh8z/3Of0zz95/7v8a3Pp1zftu5//u/95xzc+KqpKSkK0yGDXAcDsLq
-        0tLScZDrsP8jJhoLD5korfDdgj4Or15ReCFzfPJEN6AQCmAO7MJ8274PMNVp1SMKjoTH8BaWME8TuyoI
-        33JfhO5Se5v/TSpEwf3wDebZnFb468Nu+ArbbU4uJq9NoSnwDk5BF7v+KmLawCt4AQU2JxMF8mELPIHx
-        NmcUcY1hK7yHdTYnEwU6gV61a9Df5ozirtUjdib8hEM2JxMF+kAx6PZ3sjmjuICaxPal1cN4GdrZlb1I
-        7gV6t89DD5szinnrEDvSF1AErezKXiR3g3NwB4bZnFHENWTulb6AM1DfruxFcmvYCXoLlsYpxrzNiTsN
-        ehULbU4uimj51er2HEbbnFZMrts/37/+GYyxK7moFRYiF70Cve2qJEIGOe4jzXqb/10U1Ntw2cVfwza6
-        /aCe/cNhj/wS/eKQWJ2i6ADQHfjleTTRU/gMJR7/gGN0a9B2hI0wwSV0h7ozXgwD6IeLjyWCm5A0A+7T
-        /6vwf6EZDLPpP7DtAUyk25P2rG2vadbT5nmK9CIgn0AVu+nE76Bl+SSsg2EwGtbiPkqrJbhQsXFErO5Q
-        I09XUfj18B2OQkPwdRgBDR1SSYRp8yqIMqoWsbtpKm/tGFvCAQdpV1sFbe3OKFLaKy+OqLmIpoFTI2HQ
-        /60TjgIe04yzq0oRW1cXq9wyMX4Je0ELmuqlxPgENHN6qsAKO7Wnz7WrShGrZ6JYuWVifJWms0MUo636
-        SOSNxLiIZnoIoJMLtzFq5VsTjDGlYn+K/LQHEmxhg3NYSmVOvWrax69CfjDGlOukRP5dmp52p4Rdx7Yz
-        UVS5ypwX6X+iXRwMWSgqUy5q6GA6yO6UsLeA81FUueQYog6tNp0Ojo8tcu6FShbjN7DM7pRwjcJe4dtC
-        YxVYAFpoNjk2K5GXB5MgrHYSfU00yiGK0VeVHrog+jpBT4U8OXfAV+yVbls2Ir/COkBNHecfwV3X/1Na
-        tmuFRJw6dn0Mg4RSMWoMD6VjiNgJNHVDMoOXkTmx9PrqAdO+EEvEboZoL6DzwvbEokYP6ACXbJJN64H+
-        620QdkiJvs6LA+nWCRdAR/+dTjSJoFjqq4lxLuNpcAFW2KwfORT2wSximtqMcnJ+A51F4FFBJFqrAAAA
-        AElFTkSuQmCC
+        vAAADrwBlbxySQAAA25JREFUWEet11uo5mMUx/FxzDnn5BBKk3BBEslhLkgphxzHMNMk54TkLCFxodQe
+        ElLIhRxyKKPEMGWSQ2pLDI1TLlyM0xAXhM/Senv++u/V++79vnvmW/vi/a/fs9azn/+zDv8FC8YEh+JC
+        3I0X8TRui4hzI2KHqt+k4Bx8HiPAhzimrtsk4JqI+LUFeh9TWIzL8UhEfNRsv2BpXb9R4Aysw4+4PiJ2
+        rpoEN7VN5CkdUO3zIh3hSfyJK6u9D7bFo/gDD1b7xETElrgIP+EVHFI1FeyL7/FtvqJqnwjsgfvxJc6r
+        9mFgJzyAn3FntU8EFrZUexfHV/swImIbXIJ/8Ey1T0SmFKbb8S+s9mFExOY4tl3G1di/asYGR7XcfgNH
+        VPswImKrzJq2gVXYu2rGBofhdXyMU6t9GNg+Im5pG1iZmVE1Y4N98HDLghvGcRYRu+PVlopT1T4xrfxm
+        dfsGZ1V7n3b8V7X//mucXTUT0xWi5vQdHF01HRGxqOk2RMRd1T5vWjasbs7XY0VEHJcp1+yn4bFeU5qu
+        PjYanNBO4N9eoK/wG7Tff+OFiNgMB+EenN/5iIjDcV366jY/Ftl8cDE+64IPA79HxEkRcRnWtmdrcUFE
+        HInX2rP1+Yqwa401gyzFzdkHbeFfrSy/nGU2UzMvJu6IiOdbCZ6qGxtFO6Eda9wB7fI92xO/h9Mzz6u2
+        ozWvxTPDjCY759DWHhF7RcRTTZRd7VbsV3XDyI3XQKPAtRGxXXWQ7zsnnBSsy1lvhmAWImLr3GwJ8h0e
+        bwUt/fVtL2G36uDmZsyefsWMCLPQ7sR0CbAmIg7uabJVP1c0qyJi+UCQU23Odq3y3d4PMBd9p83x0IGk
+        a3BV3xkz1bKPr8kMqItnozrEJ5l6VdfGtpVV3xnfysk3i0VdOBfVYRtMF1Ud9sz2XvVpOLktzKZzYF04
+        F/i07xA/4Maqi4gz67dF/k4HV7dCc29dNA5Z1bCkq3ad4wzY0+RXVV66zp4T9NJBRcRD2cOHHdsk1DrQ
+        xvkv8k40/32ybG8xWNjGrg3V4SSks+yMJchIslFl6g8WZ8GoggnJ9M0Lln1hLHDf/70g87YKJiUH17zA
+        eLv3LOtBvusVXYdsz3NePDGnqO748t3lRDOvv/5XUxY0LMObWVm75zgFT+DSiNile578B51F4FHueb4u
+        AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoSpend.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoSpend.Designer.cs
index 7a840619fa447d1383e6709740e7cc8f245885f2..3d43d642d5eeaa47f229bb48f5a054f64b1e28c9 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoSpend.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmCustoSpend
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoSpend.cs
similarity index 93%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoSpend.cs
index 328f5cdd17bd8a26a5ed0db482ac0f6a6302fad8..6c4f559f64296bf19f1926593d9ee879416fc33f 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoSpend.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmCustoSpend : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoSpend.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCustoSpend.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCustoSpend.resx
diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.Designer.cs
new file mode 100644
index 0000000000000000000000000000000000000000..5a52f8e774266a62259463f9cc4fda0011efe3aa
--- /dev/null
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.Designer.cs
@@ -0,0 +1,235 @@
+namespace EOM.TSHotelManagement.FormUI
+{
+    partial class FrmCustomerManager
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+            toolTip1 = new ToolTip(components);
+            cmsCustoManager = new Sunny.UI.UIContextMenuStrip();
+            tsmiCustoNo = new ToolStripMenuItem();
+            uiLine1 = new Sunny.UI.UILine();
+            btnSerach = new AntdUI.Button();
+            btnAddCusto = new AntdUI.Button();
+            btnUpdCustomer = new AntdUI.Button();
+            dgvCustomerList = new AntdUI.Table();
+            btnPg = new AntdUI.Pagination();
+            cbOnlyVip = new AntdUI.Checkbox();
+            label1 = new AntdUI.Label();
+            label2 = new AntdUI.Label();
+            txtCustoName = new AntdUI.Input();
+            txtCustoNo = new AntdUI.Input();
+            cmsCustoManager.SuspendLayout();
+            SuspendLayout();
+            // 
+            // toolTip1
+            // 
+            toolTip1.ToolTipIcon = ToolTipIcon.Info;
+            toolTip1.ToolTipTitle = "获取账号";
+            // 
+            // cmsCustoManager
+            // 
+            cmsCustoManager.BackColor = Color.FromArgb(243, 249, 255);
+            cmsCustoManager.Font = new Font("微软雅黑", 12F);
+            cmsCustoManager.Items.AddRange(new ToolStripItem[] { tsmiCustoNo });
+            cmsCustoManager.Name = "cmsCustoManager";
+            cmsCustoManager.Size = new Size(177, 30);
+            // 
+            // tsmiCustoNo
+            // 
+            tsmiCustoNo.Image = Properties.Resources.复制;
+            tsmiCustoNo.Name = "tsmiCustoNo";
+            tsmiCustoNo.Size = new Size(176, 26);
+            tsmiCustoNo.Text = "复制用户编号";
+            tsmiCustoNo.Click += tsmiCustoNo_Click;
+            // 
+            // uiLine1
+            // 
+            uiLine1.BackColor = Color.Transparent;
+            uiLine1.Font = new Font("微软雅黑", 12F);
+            uiLine1.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLine1.Location = new Point(772, 411);
+            uiLine1.Margin = new Padding(4);
+            uiLine1.MinimumSize = new Size(2, 3);
+            uiLine1.Name = "uiLine1";
+            uiLine1.Size = new Size(291, 24);
+            uiLine1.TabIndex = 124;
+            uiLine1.Text = "右键可复制快速客户编号";
+            // 
+            // btnSerach
+            // 
+            btnSerach.Font = new Font("Microsoft YaHei UI", 12F);
+            btnSerach.Location = new Point(602, 441);
+            btnSerach.Name = "btnSerach";
+            btnSerach.Size = new Size(93, 47);
+            btnSerach.TabIndex = 127;
+            btnSerach.Text = "搜    索";
+            btnSerach.Type = AntdUI.TTypeMini.Primary;
+            btnSerach.Click += btnSerach_BtnClick;
+            // 
+            // btnAddCusto
+            // 
+            btnAddCusto.Font = new Font("Microsoft YaHei UI", 12F);
+            btnAddCusto.Location = new Point(772, 441);
+            btnAddCusto.Name = "btnAddCusto";
+            btnAddCusto.Size = new Size(93, 47);
+            btnAddCusto.TabIndex = 128;
+            btnAddCusto.Text = "添加客户";
+            btnAddCusto.Type = AntdUI.TTypeMini.Primary;
+            btnAddCusto.Click += btnAddCusto_BtnClick;
+            // 
+            // btnUpdCustomer
+            // 
+            btnUpdCustomer.Enabled = false;
+            btnUpdCustomer.Font = new Font("Microsoft YaHei UI", 12F);
+            btnUpdCustomer.Location = new Point(942, 441);
+            btnUpdCustomer.Name = "btnUpdCustomer";
+            btnUpdCustomer.Size = new Size(93, 47);
+            btnUpdCustomer.TabIndex = 129;
+            btnUpdCustomer.Text = "修改客户";
+            btnUpdCustomer.Type = AntdUI.TTypeMini.Primary;
+            btnUpdCustomer.Click += btnUpdCustomer_Click;
+            // 
+            // dgvCustomerList
+            // 
+            dgvCustomerList.Bordered = true;
+            dgvCustomerList.ContextMenuStrip = cmsCustoManager;
+            dgvCustomerList.Location = new Point(10, 7);
+            dgvCustomerList.Name = "dgvCustomerList";
+            dgvCustomerList.Size = new Size(1053, 391);
+            dgvCustomerList.TabIndex = 130;
+            dgvCustomerList.CellClick += dgvCustomerList_CellClick;
+            dgvCustomerList.CellDoubleClick += dgvCustomerList_CellDoubleClick;
+            // 
+            // btnPg
+            // 
+            btnPg.Current = 0;
+            btnPg.Location = new Point(10, 404);
+            btnPg.Name = "btnPg";
+            btnPg.PageSize = 15;
+            btnPg.ShowSizeChanger = true;
+            btnPg.Size = new Size(636, 31);
+            btnPg.TabIndex = 134;
+            btnPg.Total = 1000000;
+            btnPg.ValueChanged += btnPg_ValueChanged;
+            btnPg.ShowTotalChanged += btnPg_ShowTotalChanged;
+            // 
+            // cbOnlyVip
+            // 
+            cbOnlyVip.AutoCheck = true;
+            cbOnlyVip.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            cbOnlyVip.Location = new Point(630, 412);
+            cbOnlyVip.Name = "cbOnlyVip";
+            cbOnlyVip.Size = new Size(120, 23);
+            cbOnlyVip.TabIndex = 148;
+            cbOnlyVip.Text = "仅查看会员";
+            cbOnlyVip.CheckedChanged += cbOnlyVip_CheckedChanged;
+            // 
+            // label1
+            // 
+            label1.Font = new Font("Microsoft YaHei UI", 12.5F);
+            label1.Location = new Point(283, 453);
+            label1.Name = "label1";
+            label1.Size = new Size(86, 26);
+            label1.TabIndex = 152;
+            label1.Text = "客户姓名";
+            label1.TextAlign = ContentAlignment.MiddleCenter;
+            label1.TooltipConfig = null;
+            // 
+            // label2
+            // 
+            label2.Font = new Font("Microsoft YaHei UI", 12.5F);
+            label2.Location = new Point(12, 453);
+            label2.Name = "label2";
+            label2.Size = new Size(86, 26);
+            label2.TabIndex = 151;
+            label2.Text = "客户编号";
+            label2.TextAlign = ContentAlignment.MiddleCenter;
+            label2.TooltipConfig = null;
+            // 
+            // txtCustoName
+            // 
+            txtCustoName.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txtCustoName.Location = new Point(375, 444);
+            txtCustoName.Name = "txtCustoName";
+            txtCustoName.PlaceholderText = "请输入客户姓名...";
+            txtCustoName.Size = new Size(173, 42);
+            txtCustoName.TabIndex = 150;
+            // 
+            // txtCustoNo
+            // 
+            txtCustoNo.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            txtCustoNo.Location = new Point(104, 444);
+            txtCustoNo.Name = "txtCustoNo";
+            txtCustoNo.PlaceholderText = "请输入客户编号...";
+            txtCustoNo.Size = new Size(173, 42);
+            txtCustoNo.TabIndex = 149;
+            // 
+            // FrmCustomerManager
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            BackColor = Color.FromArgb(235, 243, 255);
+            ClientSize = new Size(1072, 490);
+            Controls.Add(label1);
+            Controls.Add(label2);
+            Controls.Add(txtCustoName);
+            Controls.Add(txtCustoNo);
+            Controls.Add(cbOnlyVip);
+            Controls.Add(btnPg);
+            Controls.Add(dgvCustomerList);
+            Controls.Add(btnUpdCustomer);
+            Controls.Add(btnAddCusto);
+            Controls.Add(btnSerach);
+            Controls.Add(uiLine1);
+            FormBorderStyle = FormBorderStyle.None;
+            Margin = new Padding(4);
+            Name = "FrmCustomerManager";
+            StartPosition = FormStartPosition.CenterScreen;
+            Text = "TS酒店管理系统";
+            Load += FrmCustomerManager_Load;
+            cmsCustoManager.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private System.Windows.Forms.ToolTip toolTip1;
+        private Sunny.UI.UIContextMenuStrip cmsCustoManager;
+        private System.Windows.Forms.ToolStripMenuItem tsmiCustoNo;
+        private Sunny.UI.UILine uiLine1;
+        private AntdUI.Button btnSerach;
+        private AntdUI.Button btnAddCusto;
+        private AntdUI.Button btnUpdCustomer;
+        private AntdUI.Table dgvCustomerList;
+        private AntdUI.Pagination btnPg;
+        private AntdUI.Checkbox cbOnlyVip;
+        private AntdUI.Label label1;
+        private AntdUI.Label label2;
+        private AntdUI.Input txtCustoName;
+        private AntdUI.Input txtCustoNo;
+    }
+}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs
similarity index 35%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs
index 98de744081755dd9aacd6ad8a5d4502ad6fbcec6..eb9e0c7abf9b41c389ccb852d8b661aaa79f2759 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.cs
@@ -22,24 +22,35 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmCustomerManager : Form
     {
+        public static string cm_CustoNo;
+        public static string cm_CustoName;
+        public static int cm_CustoSex;
+        public static string cm_CustoTel;
+        public static int cm_PassportType;
+        public static string cm_CustoID;
+        public static string cm_CustoAddress;
+        public static DateTime cm_CustoBirth;
+        public static int cm_CustoType;
 
-        public delegate void ReloadCustomerList();
+        public delegate void ReloadCustomerList(bool onlyVip);
 
 
         //定义委托类型的变量
         public static ReloadCustomerList ReloadCustomer;
 
+        private LoadingProgress _loadingProgress;
         public FrmCustomerManager()
         {
             InitializeComponent();
+            _loadingProgress = new LoadingProgress();
             ReloadCustomer = LoadCustomer;
         }
 
@@ -49,78 +60,120 @@ namespace EOM.TSHotelManager.FormUI
         #region 用户管理界面加载事件方法
         private void FrmCustomerManager_Load(object sender, EventArgs e)
         {
+            _loadingProgress.Show();
             this.btnPg.PageSize = 15;
             LoadCustomer();
+            _loadingProgress.Close();
         }
         #endregion
 
         private static bool? onlyVip = null;
 
         #region 加载用户信息列表
-        private void LoadCustomer()
+        private void LoadCustomer(bool onlyVip = false)
+        {
+            var dataCount = 0;
+            btnPg.PageSizeOptions = new int[] { 15, 30, 50, 100 };
+            dgvCustomerList.Spin("正在加载中...", config =>
+            {
+                TableComHelper tableComHelper = new TableComHelper();
+                dgvCustomerList.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns<Custo>());
+                dgvCustomerList.DataSource = GetPageData(btnPg.Current, btnPg.PageSize, ref dataCount, onlyVip);
+                btnPg.PageSize = 15;
+                btnPg.Current = 1;
+                btnPg.Total = dataCount;
+            }, () =>
+            {
+                System.Diagnostics.Debug.WriteLine("加载结束");
+            });
+        }
+
+
+        object GetPageData(int current, int pageSize, ref int totalCount, bool onlyVip = false)
         {
             dic = new Dictionary<string, string>()
             {
-                { "pageIndex","1"},
-                { "pageSize","15"}
+                { "pageIndex",current <= 0 ? "1":current.ToString()},
+                { "pageSize",pageSize.ToString()}
             };
-            if (onlyVip != null && (bool)onlyVip)
+            if (onlyVip)
             {
                 dic.Add("onlyVip", onlyVip.ToString());
             }
-            result = HttpHelper.Request("Custo/SelectCustoAll", null, dic);
+            result = HttpHelper.Request("Custo/SelectCustoAll", dic);
             if (result.statusCode != 200)
             {
-                UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！");
-                return;
+                AntdUI.Message.error(this, "SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！");
+                return null!;
             }
             OSelectAllDto<Custo> custos = HttpHelper.JsonToModel<OSelectAllDto<Custo>>(result.message);
-            btnPg.TotalCount = custos.total;
-            this.dgvCustomerList.AutoGenerateColumns = false;
-            this.dgvCustomerList.DataSource = custos.listSource;
+            totalCount = custos.total;
+            var listTableSource = new List<AntdUI.AntItem[]>();
+
+            custos.listSource = custos.listSource.OrderBy(a => a.CustoNo).ThenBy(a => a.CustoName).ToList();
+
+            TableComHelper tableComHelper = new TableComHelper();
+            listTableSource = tableComHelper.ConvertToAntdItems(custos.listSource);
+
+            return listTableSource;
         }
+
         #endregion
 
         int count = 0;
         private void btnSerach_BtnClick(object sender, EventArgs e)
         {
-            dgvCustomerList.ClearRows();
-            dgvCustomerList.AutoGenerateColumns = false;
-            List<Custo> custos = new List<Custo>();
-            if (!txtCustoNo.Text.IsNullOrEmpty())
+            OSelectAllDto<Custo> custos = new OSelectAllDto<Custo>();
+            if (!txtCustoNo.Text.IsNullOrEmpty() || !txtCustoName.Text.IsNullOrEmpty())
             {
-                var custo = new Custo()
+                if (!txtCustoNo.Text.IsNullOrEmpty())
                 {
-                    CustoNo = txtCustoNo.Text.Trim()
-                };
-                result = HttpHelper.Request("Custo/SelectCustoByInfo", HttpHelper.ModelToJson(custo));
+                    dic = new Dictionary<string, string>
+                    {
+                        { "CustoNo", txtCustoNo.Text.Trim() }
+                    };
+                }
+                if (!txtCustoName.Text.IsNullOrEmpty())
+                {
+                    dic = new Dictionary<string, string>
+                    {
+                        { "CustoName",  txtCustoName.Text.Trim() }
+                    };
+                }
+                result = HttpHelper.Request("Custo/SelectCustoByInfo", dic);
                 if (result.statusCode != 200)
                 {
-                    UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！");
+                    AntdUI.Message.error(this, "SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！");
                     return;
                 }
-                custos = HttpHelper.JsonToList<Custo>(result.message);
             }
-            else if (!txtCustoName.Text.IsNullOrEmpty())
+            else
             {
-                var custo = new Custo()
-                {
-                    CustoName = txtCustoName.Text.Trim()
-                };
-                result = HttpHelper.Request("Custo/SelectCustoByInfo", HttpHelper.ModelToJson(custo));
+                result = HttpHelper.Request("Custo/SelectCustoAll?pageIndex=1&pageSize=15");
                 if (result.statusCode != 200)
                 {
-                    UIMessageBox.ShowError("SelectCustoByInfo+接口服务异常，请提交Issue或尝试更新版本！");
+                    AntdUI.Message.error(this, "SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！");
                     return;
                 }
-                custos = HttpHelper.JsonToList<Custo>(result.message);
             }
-            else
+
+            custos = HttpHelper.JsonToModel<OSelectAllDto<Custo>>(result.message);
+
+            var listTableSource = new List<AntdUI.AntItem[]>();
+
+            custos.listSource = custos.listSource.OrderBy(a => a.CustoNo).ThenBy(a => a.CustoName).ToList();
+
+            TableComHelper tableComHelper = new TableComHelper();
+            listTableSource = tableComHelper.ConvertToAntdItems(custos.listSource);
+
+            dgvCustomerList.Spin("正在加载中...", config =>
             {
-                result = HttpHelper.Request("Custo/SelectCustoAll?pageIndex=1&pageSize=15");
-                var listSource = HttpHelper.JsonToModel<OSelectAllDto<Custo>>(result.message);
-                custos = listSource.listSource;
-            }
+                dgvCustomerList.DataSource = listTableSource;
+            }, () =>
+            {
+                System.Diagnostics.Debug.WriteLine("加载结束");
+            });
+
             dgvCustomerList.DataSource = custos;
         }
 
@@ -130,104 +183,96 @@ namespace EOM.TSHotelManager.FormUI
             frmInputs.ShowDialog();
         }
 
-        private void dgvCustomerList_CellClick(object sender, DataGridViewCellEventArgs e)
+        private void btnUpdCustomer_Click(object sender, EventArgs e)
         {
-            if (dgvCustomerList.SelectedRows.Count == 1)
+
+            if (dgvCustomerList.SelectedIndex < 0)
             {
-                btnUpdCustomer.Enabled = true;
+                AntdUI.Message.error(this, "未选中客户，无法继续操作！");
                 return;
             }
-            btnUpdCustomer.Enabled = true;
-            return;
+            FrmCustoManager.cm_CustoNo = cm_CustoNo;
+            FrmCustoManager.cm_CustoName = cm_CustoName;
+            FrmCustoManager.cm_CustoAddress = cm_CustoAddress.IsNullOrEmpty() ? "" : cm_CustoAddress.ToString();
+            FrmCustoManager.cm_CustoType = Convert.ToInt32(cm_CustoType);
+            FrmCustoManager.cm_CustoSex = Convert.ToInt32(cm_CustoSex);
+            FrmCustoManager.cm_PassportType = Convert.ToInt32(cm_PassportType);
+            FrmCustoManager.cm_CustoBirth = Convert.ToDateTime(cm_CustoBirth);
+            FrmCustoManager.cm_CustoID = cm_CustoID;
+            FrmCustoManager.cm_CustoTel = cm_CustoTel;
+            FrmEditInputs frmInputs = new FrmEditInputs();
+            frmInputs.Text = "修改客户信息";
+            frmInputs.ShowDialog();
         }
 
-        private void btnUpdCustomer_Click(object sender, EventArgs e)
+        private void tsmiCustoNo_Click(object sender, EventArgs e)
         {
-            if (dgvCustomerList.SelectedRows.Count == 1)
+            if (!cm_CustoNo.IsNullOrEmpty())
             {
-                FrmCustoManager.cm_CustoNo = dgvCustomerList.SelectedRows[0].Cells["CustoNo"].Value.ToString();
-                FrmCustoManager.cm_CustoName = dgvCustomerList.SelectedRows[0].Cells["CustoName"].Value.ToString();
-                FrmCustoManager.cm_CustoAddress = dgvCustomerList.SelectedRows[0].Cells["CustoAdress"].Value == null ? "" : dgvCustomerList.SelectedRows[0].Cells["CustoAdress"].Value.ToString();
-                FrmCustoManager.cm_CustoType = Convert.ToInt32(dgvCustomerList.SelectedRows[0].Cells["Column2"].Value);
-                FrmCustoManager.cm_CustoSex = Convert.ToInt32(dgvCustomerList.SelectedRows[0].Cells["Column4"].Value);
-                FrmCustoManager.cm_PassportType = Convert.ToInt32(dgvCustomerList.SelectedRows[0].Cells["Column1"].Value);
-                FrmCustoManager.cm_CustoBirth = Convert.ToDateTime(dgvCustomerList.SelectedRows[0].Cells["CustoBirth"].Value.ToString());
-                FrmCustoManager.cm_CustoID = dgvCustomerList.SelectedRows[0].Cells["Column3"].Value.ToString();
-                FrmCustoManager.cm_CustoTel = dgvCustomerList.SelectedRows[0].Cells["CustoTel"].Value.ToString();
-                FrmEditInputs frmInputs = new FrmEditInputs();
-                frmInputs.Text = "修改客户信息";
-                frmInputs.ShowDialog();
+                Clipboard.SetText(cm_CustoNo);
+                AntdUI.Message.success(this, "复制完成！");
             }
         }
 
-        private void btnPg_Click(object sender, EventArgs e)
+        private void dgvCustomerList_CellClick(object sender, AntdUI.TableClickEventArgs e)
         {
+            if (e.Record is IList<AntdUI.AntItem> data)
+            {
+                cm_CustoNo = data[0].value.ToString();
+                cm_CustoName = data[1].value.ToString();
+                cm_CustoSex = Convert.ToInt32(SexConstant.GetCodeByDescription(data[2].value.ToString()));
+                cm_CustoTel = data[3].value.ToString();
+                cm_CustoBirth = Convert.ToDateTime(data[4].value.ToString());
+                cm_CustoType = Convert.ToInt32(CustomTypeConstant.GetCodeByDescription(data[5].value.ToString()));
+                cm_PassportType = Convert.ToInt32(PassportConstant.GetCodeByDescription(data[6].value.ToString()));
+                cm_CustoID = data[7].value.ToString();
+                cm_CustoAddress = data[8].value.ToString();
+                btnUpdCustomer.Enabled = true;
+            }
+        }
 
+        private void cbOnlyVip_CheckedChanged(object sender, AntdUI.BoolEventArgs e)
+        {
+            LoadCustomer(e.Value);
         }
 
-        private void btnPg_PageChanged(object sender, object pagingSource, int pageIndex, int count)
+        private string btnPg_ShowTotalChanged(object sender, AntdUI.PagePageEventArgs e)
         {
-            dic = new Dictionary<string, string>()
-            {
-                { "pageIndex",pageIndex.ToString()},
-                { "pageSize",count.ToString()}
-            };
-            if (onlyVip != null && (bool)onlyVip)
-            {
-                dic.Add("onlyVip", onlyVip.ToString());
-            }
-            result = HttpHelper.Request("Custo/SelectCustoAll", null, dic);
-            if (result.statusCode != 200)
-            {
-                UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！");
-                return;
-            }
-            OSelectAllDto<Custo> custos = HttpHelper.JsonToModel<OSelectAllDto<Custo>>(result.message);
-            this.btnPg.TotalCount = custos.total;
-            this.dgvCustomerList.AutoGenerateColumns = false;
-            this.dgvCustomerList.DataSource = custos.listSource;
+            return $"{e.PageSize} / {e.Total}条 共{e.PageTotal}页";
         }
 
-        private void tsmiCustoNo_Click(object sender, EventArgs e)
+        private void btnPg_ValueChanged(object sender, AntdUI.PagePageEventArgs e)
         {
-            Clipboard.SetText(dgvCustomerList.SelectedRows[0].Cells["CustoNo"].Value as string);
-            UIMessageTip.ShowOk("复制完成！", 1500);
+            var dataCount = 0;
+            dgvCustomerList.Spin("正在加载中...", config =>
+            {
+                dgvCustomerList.DataSource = GetPageData(e.Current, e.PageSize, ref dataCount,cbOnlyVip.Checked);
+                btnPg.Total = dataCount;
+            }, () =>
+            {
+                System.Diagnostics.Debug.WriteLine("加载结束");
+            });
         }
 
-        private void cbOnlyVip_CheckedChanged(object sender, EventArgs e)
+        private void dgvCustomerList_CellDoubleClick(object sender, AntdUI.TableClickEventArgs e)
         {
-            if (sender is UICheckBox checkBox)
+            _loadingProgress.Show();
+            if (e.Record is IList<AntdUI.AntItem> data)
             {
-                if (checkBox.Checked)
-                {
-                    onlyVip = true;
-                    dic = new Dictionary<string, string>()
-                    {
-                        { "pageIndex","1"},
-                        { "pageSize","15"}
-                    };
-                    if (onlyVip != null && (bool)onlyVip)
-                    {
-                        dic.Add("onlyVip", onlyVip.ToString());
-                    }
-                    result = HttpHelper.Request("Custo/SelectCustoAll", null, dic);
-                    if (result.statusCode != 200)
-                    {
-                        UIMessageBox.ShowError("SelectCustoAll+接口服务异常，请提交Issue或尝试更新版本！");
-                        return;
-                    }
-                    OSelectAllDto<Custo> custos = HttpHelper.JsonToModel<OSelectAllDto<Custo>>(result.message);
-                    this.btnPg.TotalCount = custos.total;
-                    this.dgvCustomerList.AutoGenerateColumns = false;
-                    this.dgvCustomerList.DataSource = custos.listSource;
-                }
-                else
-                {
-                    onlyVip = false;
-                    LoadCustomer();
-                }
-            }
+                FrmCustoManager.cm_CustoNo = data[0].value.ToString();
+                FrmCustoManager.cm_CustoName = data[1].value.ToString();
+                FrmCustoManager.cm_CustoSex = Convert.ToInt32(SexConstant.GetCodeByDescription(data[2].value.ToString()));
+                FrmCustoManager.cm_CustoTel = data[3].value.ToString();
+                FrmCustoManager.cm_CustoBirth = Convert.ToDateTime(data[4].value.ToString());
+                FrmCustoManager.cm_CustoType = Convert.ToInt32(CustomTypeConstant.GetCodeByDescription(data[5].value.ToString()));
+                FrmCustoManager.cm_PassportType = Convert.ToInt32(PassportConstant.GetCodeByDescription(data[6].value.ToString()));
+                FrmCustoManager.cm_CustoID = data[7].value.ToString();
+                FrmCustoManager.cm_CustoAddress = data[8].value.ToString();
 
+                FrmEditInputs frmInputs = new FrmEditInputs(_loadingProgress);
+                frmInputs.Text = "修改客户信息";
+                frmInputs.ShowDialog();
+            }
         }
     }
 
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.resx
similarity index 93%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.resx
index af32865ec12ff9e3beb4b98fb4cf5b8420e12d69..05f7066207d7f4ce437ca6c3b5aeb7623cc43b89 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.resx
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmCustomerManagement.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -117,4 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="cmsCustoManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>179, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmDepartment.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmDepartment.Designer.cs
index 5fcef8a61fe9535c98a514a9d8da7256108f0b74..948ce055e74f288e02928ff4dc273c0a54c1b016 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmDepartment.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmDepartment
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmDepartment.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmDepartment.cs
index 9d92605616ae4d2ea552dcf8e4208656ca5b4878..5143f51e374cf01899b4429b412acc0aca15445a 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmDepartment.cs
@@ -22,12 +22,12 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using jvncorelib.EntityLib;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmDepartment : UIForm
     {
@@ -200,7 +200,7 @@ namespace EOM.TSHotelManager.FormUI
                 {
                     { "deptNo",txtDeptNo.Text.Trim()}
                 };
-                result = HttpHelper.Request("Worker/CheckWorkerBydepartment", null, dic);
+                result = HttpHelper.Request("Worker/CheckWorkerBydepartment", dic);
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("CheckWorkerBydepartment+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmDepartment.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmDepartment.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmDepartment.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.Designer.cs
index 800b7dac42bf6cf69893abb33a564620f26350bc..0c0217c1286a85e19e2ab8b35788087161c8a98b 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmEditInputs
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs
similarity index 95%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs
index b47651ccf93bf267cb1bcf07d7dc1717bdeee7e2..5506f6004c67a2ef01c022334d56ffe30312d484 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.cs
@@ -22,17 +22,19 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmEditInputs : UIEditForm
     {
-        public FrmEditInputs()
+        private LoadingProgress? _loadingProgress;
+        public FrmEditInputs(LoadingProgress? loadingProgress = null)
         {
             InitializeComponent();
+            _loadingProgress = loadingProgress;
         }
 
         Dictionary<string, string> dic = null;
@@ -124,6 +126,10 @@ namespace EOM.TSHotelManager.FormUI
                 }
 
             }
+            if (_loadingProgress != null)
+            {
+                _loadingProgress.Close();
+            }
         }
 
         private void btnOK_UpdClick(object sender, EventArgs e)
@@ -160,7 +166,7 @@ namespace EOM.TSHotelManager.FormUI
             RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "修改了一名客户信息，客户编号为：" + custo.CustoNo, 3);
             #endregion
             this.Close();
-            FrmCustomerManager.ReloadCustomer();
+            FrmCustomerManager.ReloadCustomer(false);
 
             foreach (Control Ctrol in this.Controls)
             {
@@ -194,7 +200,7 @@ namespace EOM.TSHotelManager.FormUI
 
             };
 
-            result = HttpHelper.Request("Custo/InsertCustomerInfo", HttpHelper.ModelToJson<Custo>(custo), null);
+            result = HttpHelper.Request("Custo/InsertCustomerInfo", HttpHelper.ModelToJson(custo));
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("InsertCustomerInfo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -203,7 +209,7 @@ namespace EOM.TSHotelManager.FormUI
             if (result.message.ToString().Equals("true"))
             {
                 UIMessageBox.Show("添加成功", "系统提示", UIStyle.Green, UIMessageBoxButtons.OK);
-                FrmCustomerManager.ReloadCustomer();
+                FrmCustomerManager.ReloadCustomer(false);
                 #region 获取添加操作日志所需的信息
                 RecordHelper.Record(LoginInfo.WorkerNo + "-" + LoginInfo.WorkerName + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + LoginInfo.SoftwareVersion + "执行：" + "添加了一名客户，客户编号为：" + custo.CustoNo, 3);
                 #endregion
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmEditInputs.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmEditInputs.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEducation.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmEducation.Designer.cs
index 75f7cb94b846156a30840e3d7f315e3eebdef268..0443a2254f416b14452b6bd051952dcb16aa0123 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEducation.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmEducation
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEducation.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmEducation.cs
index 8c2c077a45b92fc6281b8f2e0cfccf6540a736b9..96af102c2361958d0ff66b49927257d7eb2c3fa0 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEducation.cs
@@ -23,11 +23,11 @@
  */
 
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmEducation : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmEducation.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmEducation.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmEducation.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmGoodOrBad.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmGoodOrBad.Designer.cs
index f34ee02a65e0baacc7a6c124754f69fd38f35410..c806bb69cff17219f027d2c9027390ba99776387 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmGoodOrBad.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmGoodOrBad
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmGoodOrBad.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmGoodOrBad.cs
index f64c3838c513c969bc3b367a2032934abdf57f0d..dad1d5d0ef96e940a05525ad552b6b7a92f4515d 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmGoodOrBad.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmGoodOrBad : UIForm
     {
@@ -62,7 +62,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "wn",lblWorkerNo.Text}
             };
-            result = HttpHelper.Request("WorkerGoodBad/SelectAllGoodBadByWorkNo", null, dic);
+            result = HttpHelper.Request("WorkerGoodBad/SelectAllGoodBadByWorkNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectAllGoodBadByWorkNo+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmGoodOrBad.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmGoodOrBad.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmGoodOrBad.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs
index 2a248769f0744db5f0339f911df2a61ec1275a11..493c89b560f188697c4369abe8822ad79b5b3408 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmMySpace
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs
index 60315a8e63f7eb303ae7f4d28103dfd9281d41b8..65c0bdc9a19de956037d1abb84ff3328b5dd9598 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.cs
@@ -22,15 +22,15 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using jvncorelib.EncryptorLib;
 using jvncorelib.EntityLib;
 using Sunny.UI;
 using System.ComponentModel;
 using System.Text.RegularExpressions;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmMySpace : UIForm
     {
@@ -45,7 +45,7 @@ namespace EOM.TSHotelManager.FormUI
             //加载民族信息
             Dictionary<string, string> dic = new Dictionary<string, string>();
             dic.Add("delete_mk", "0");
-            var result = HttpHelper.Request("Base/SelectNationAll", null, dic);
+            var result = HttpHelper.Request("Base/SelectNationAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectNationAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -57,7 +57,7 @@ namespace EOM.TSHotelManager.FormUI
             //加载性别信息
             dic = new Dictionary<string, string>();
             dic.Add("delete_mk", "0");
-            result = HttpHelper.Request("Base/SelectSexTypeAll", null, dic);
+            result = HttpHelper.Request("Base/SelectSexTypeAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -79,7 +79,7 @@ namespace EOM.TSHotelManager.FormUI
             //加载职位信息
             dic = new Dictionary<string, string>();
             dic.Add("delete_mk", "0");
-            result = HttpHelper.Request("Base/SelectPositionAll", null, dic);
+            result = HttpHelper.Request("Base/SelectPositionAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -100,7 +100,7 @@ namespace EOM.TSHotelManager.FormUI
         {
             var dic = new Dictionary<string, string>();
             dic.Add("workerId", LoginInfo.WorkerNo);
-            var result = HttpHelper.Request("Worker/SelectWorkerInfoByWorkerId", null, dic);
+            var result = HttpHelper.Request("Worker/SelectWorkerInfoByWorkerId", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectWorkerInfoByWorkerId+接口服务异常，请提交Issue或尝试更新版本！");
@@ -123,7 +123,7 @@ namespace EOM.TSHotelManager.FormUI
             }
             dic = new Dictionary<string, string>();
             dic.Add("WorkerId", LoginInfo.WorkerNo);
-            result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic);
+            result = HttpHelper.Request("WorkerPicture/WorkerPic", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！");
@@ -151,7 +151,7 @@ namespace EOM.TSHotelManager.FormUI
         {
             //校验旧密码是否正确
             Worker worker = new Worker() { WorkerId = LoginInfo.WorkerNo, WorkerPwd = txtOldPwd.Text.Trim() };
-            var result = HttpHelper.Request("Worker/SelectWorkerInfoByWorkerIdAndWorkerPwd", HttpHelper.ModelToJson(worker), null);
+            var result = HttpHelper.Request("Worker/SelectWorkerInfoByWorkerIdAndWorkerPwd", HttpHelper.ModelToJson(worker));
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectWorkerInfoByWorkerIdAndWorkerPwd+接口服务异常，请提交Issue或尝试更新版本！");
@@ -205,7 +205,7 @@ namespace EOM.TSHotelManager.FormUI
 
         private void btnUpdPwd_Click(object sender, EventArgs e)
         {
-            var result = HttpHelper.Request("Worker/UpdWorkerPwdByWorkNo", HttpHelper.ModelToJson(new Worker { WorkerId = LoginInfo.WorkerNo, WorkerPwd = txtNewPwd.Text.Trim() }), null);
+            var result = HttpHelper.Request("Worker/UpdWorkerPwdByWorkNo", HttpHelper.ModelToJson(new Worker { WorkerId = LoginInfo.WorkerNo, WorkerPwd = txtNewPwd.Text.Trim() }));
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("UpdWorkerPwdByWorkNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -271,7 +271,7 @@ namespace EOM.TSHotelManager.FormUI
 
             if (CheckInput(worker))
             {
-                result = HttpHelper.Request("Worker/UpdateWorker", HttpHelper.ModelToJson(worker), null);
+                result = HttpHelper.Request("Worker/UpdateWorker", HttpHelper.ModelToJson(worker));
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("UpdateWorker+接口服务异常，请提交Issue或尝试更新版本！");
@@ -311,7 +311,7 @@ namespace EOM.TSHotelManager.FormUI
             };
             Dictionary<string, string> dic = new Dictionary<string, string>();
             dic.Add("WorkerId", txtWorkerNo.Text.Trim());
-            result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic);
+            result = HttpHelper.Request("WorkerPicture/WorkerPic", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！");
@@ -320,7 +320,7 @@ namespace EOM.TSHotelManager.FormUI
             var source = HttpHelper.JsonToModel<WorkerPic>(result.message);
             if (!source.IsNullOrEmpty())
             {
-                result = HttpHelper.Request("WorkerPicture/DeleteWorkerPic", HttpHelper.ModelToJson(workerPic), null);
+                result = HttpHelper.Request("WorkerPicture/DeleteWorkerPic", HttpHelper.ModelToJson(workerPic));
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("DeleteWorkerPic+接口服务异常，请提交Issue或尝试更新版本！");
@@ -348,7 +348,7 @@ namespace EOM.TSHotelManager.FormUI
                 WorkerId = txtWorkerNo.Text.Trim(),
                 Pic = result.Trim(),
             };
-            var requestResult = HttpHelper.Request("WorkerPicture/InsertWorkerPic", HttpHelper.ModelToJson(workerPic), null);
+            var requestResult = HttpHelper.Request("WorkerPicture/InsertWorkerPic", HttpHelper.ModelToJson(workerPic));
             if (requestResult.statusCode != 200)
             {
                 UIMessageBox.ShowError("InsertWorkerPic+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmMySpace.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmMySpace.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmNation.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmNation.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmNation.Designer.cs
index 24d5a6d958e427546cef8ecebc49567f3b6b5bc3..81eb27bee66ea96429b83ad0b992341fc3f50efd 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmNation.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmNation
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmNation.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmNation.cs
index b9285d68264f51b79fdba8d33e7c1e0cd0a03d00..98466e04976b4ffe43b4c482bb5dcd228e91ec99 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmNation.cs
@@ -22,12 +22,12 @@
  *
  */
 
-//using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+//using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmNation : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmNation.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmNation.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmNation.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmNation.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmNotice.Designer.cs
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmNotice.Designer.cs
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmNotice.cs
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmNotice.cs
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmNotice.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmNotice.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmNotice.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmOperation.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmOperation.Designer.cs
index 90d9976de180e3bbe7d9dcb5e6ef82d7b775c55b..cb37e74c8a0915804c13db86d734564c939ad5b7 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmOperation.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmOperation
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmOperation.cs
similarity index 95%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmOperation.cs
index 3bb500ce84e6014d773764c6c390e4c1960ef125..e0aadd292673454c1918e502f9840dd0533a53b9 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmOperation.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmOperation : UIForm
     {
@@ -51,7 +51,7 @@ namespace EOM.TSHotelManager.FormUI
                 { "pageIndex","1"},
                 { "pageSize","15"}
             };
-            result = HttpHelper.Request("App/SelectOperationlogAll", null, dic);
+            result = HttpHelper.Request("App/SelectOperationlogAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectOperationlogAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -70,7 +70,7 @@ namespace EOM.TSHotelManager.FormUI
                 { "pageIndex",pageIndex.ToString()},
                 { "pageSize",count.ToString()}
             };
-            result = HttpHelper.Request("App/SelectOperationlogAll", null, dic);
+            result = HttpHelper.Request("App/SelectOperationlogAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectOperationlogAll+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmOperation.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmOperation.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmOperation.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPleaseWait.Designer.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmPleaseWait.Designer.cs
index 4bd2ed50ffb356be53bcef8cafc1157257f900b4..3d9c8125f6f51b8bde648ba0737c89b018774db7 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPleaseWait.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmPleaseWait
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPleaseWait.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmPleaseWait.cs
index 6ff2c93244546e660fa8cdd931451c1a84415555..d365569a754998da8f36eaa17fa065e21e4bd812 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPleaseWait.cs
@@ -23,7 +23,7 @@
  */
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmPleaseWait : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPleaseWait.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmPleaseWait.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmPleaseWait.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPosition.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmPosition.Designer.cs
index fbb27e33259c6059bdc709042196f8417bfa5299..1d932cdc228adf5418f558bb4b9741899b22ce3c 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPosition.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmPosition
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPosition.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmPosition.cs
index 0e629affdaa91ee4a55ab74bcf9f72e431f56982..109cc8b21da5e26276cf14c7c3c65bc22a9442db 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPosition.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmPosition : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmPosition.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmPosition.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmPosition.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.Designer.cs
similarity index 62%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.Designer.cs
index cecda9c2a426bceaff3d5ff459702565f2d085cb..b8e70e1501139842b7fb07c79e8b427603cf5327 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmProgress
     {
@@ -29,17 +29,38 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmProgress));
+            spin1 = new AntdUI.Spin();
             SuspendLayout();
             // 
+            // spin1
+            // 
+            spin1.BackColor = Color.Transparent;
+            spin1.Location = new Point(7, 13);
+            spin1.Name = "spin1";
+            spin1.Size = new Size(141, 84);
+            spin1.TabIndex = 0;
+            spin1.Text = "正在加载中......";
+            // 
             // FrmProgress
             // 
+            AutoHandDpi = false;
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(292, 39);
+            BackColor = Color.FromArgb(235, 243, 255);
+            ClientSize = new Size(155, 110);
+            Controls.Add(spin1);
+            FormBorderStyle = FormBorderStyle.None;
             Icon = (Icon)resources.GetObject("$this.Icon");
+            MaximizeBox = false;
+            MinimizeBox = false;
             Name = "FrmProgress";
+            Resizable = false;
+            ShowIcon = false;
+            ShowInTaskbar = false;
+            SizeGripStyle = SizeGripStyle.Show;
             StartPosition = FormStartPosition.CenterScreen;
-            Text = "FrmProgress";
+            Text = "Loading...";
+            TopMost = true;
             Load += FrmProgress_Load;
             ResumeLayout(false);
         }
@@ -47,5 +68,6 @@
         #endregion
 
         private AntdUI.Label label1;
+        private AntdUI.Spin spin1;
     }
 }
\ No newline at end of file
diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.cs
new file mode 100644
index 0000000000000000000000000000000000000000..beecd6be4dc251bcf9f893275ee97aced30573c9
--- /dev/null
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.cs
@@ -0,0 +1,17 @@
+using AntdUI;
+
+namespace EOM.TSHotelManagement.FormUI
+{
+    public partial class FrmProgress : Window
+    {
+        public FrmProgress()
+        {
+            InitializeComponent();
+        }
+
+        private void FrmProgress_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmProgress.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.Designer.cs
index 7852d1fb853be8ff73e89edc5e29c14bb9faab5c..5e5c4b18d64386e3d1b226d3b21f0663670460fa 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmReserList
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs
similarity index 95%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs
index c8dce2a9d92d8145003478552bedb1300590a81d..4a1f3089baf6c75abbfd8316e77f417a37c621b7 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.cs
@@ -21,12 +21,12 @@
  *SOFTWARE.
  *
  */
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 using System.Transactions;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmReserList : UIForm
     {
@@ -39,7 +39,7 @@ namespace EOM.TSHotelManager.FormUI
 
         private void FrmReserList_Load(object sender, EventArgs e)
         {
-            result = HttpHelper.Request("Reser/SelectReserAll", null, null);
+            result = HttpHelper.Request("Reser/SelectReserAll");
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectReserAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -49,7 +49,7 @@ namespace EOM.TSHotelManager.FormUI
             dgvReserList.DataSource = HttpHelper.JsonToList<Reser>(result.message);
 
             #region 加载客户类型信息
-            result = HttpHelper.Request("Base/SelectCustoTypeAllCanUse", null, null);
+            result = HttpHelper.Request("Base/SelectCustoTypeAllCanUse");
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！");
@@ -64,7 +64,7 @@ namespace EOM.TSHotelManager.FormUI
             #endregion
 
             #region 加载证件类型信息
-            result = HttpHelper.Request("Base/SelectPassPortTypeAllCanUse", null, null);
+            result = HttpHelper.Request("Base/SelectPassPortTypeAllCanUse");
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectPassPortTypeAllCanUse+接口服务异常，请提交Issue或尝试更新版本！");
@@ -78,7 +78,7 @@ namespace EOM.TSHotelManager.FormUI
             #endregion
 
             #region 加载性别信息
-            result = HttpHelper.Request("Base/SelectSexTypeAll", null, null);
+            result = HttpHelper.Request("Base/SelectSexTypeAll");
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -91,11 +91,6 @@ namespace EOM.TSHotelManager.FormUI
             #endregion
         }
 
-        private void btnClose_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-
         private void btnSelect_Click(object sender, EventArgs e)
         {
             using (TransactionScope scope = new TransactionScope())
@@ -128,7 +123,7 @@ namespace EOM.TSHotelManager.FormUI
                     RoomStateId = 1,
                     RoomNo = dgvReserList.SelectedRows[0].Cells["clRoomNo"].Value.ToString()
                 };
-                result = HttpHelper.Request("Room​/UpdateRoomInfo", HttpHelper.ModelToJson(r), null);
+                result = HttpHelper.Request("Room​/UpdateRoomInfo", HttpHelper.ModelToJson(r));
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("InsertCustomerInfo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -147,7 +142,7 @@ namespace EOM.TSHotelManager.FormUI
 
                 UIMessageBox.ShowSuccess("操作成功");
                 dgvReserList.AutoGenerateColumns = false;
-                result = HttpHelper.Request("Reser/SelectReserAll", null, null);
+                result = HttpHelper.Request("Reser/SelectReserAll");
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("SelectReserAll+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmReserList.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmReserList.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.Designer.cs
index ca8f69868fcaf46c9fb8f754444d61cfa555e79e..4a16f0c5e8c94b53cb2be71bf3e28c8bfb05a428 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmReserManager
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs
index 6b44ed16ab937da85165fe9d2181e3ef8a61b032..a40a77c98f92a0ce282965212365831a6f33fb9b 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.cs
@@ -21,11 +21,11 @@
  *SOFTWARE.
  *
  */
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmReserManager : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmReserManager.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmReserManagement.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomConfig.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomConfig.Designer.cs
index 7813dab224bbfbfe445daef217f87b062e770183..c5cacc98dd3a52a5ec74bf89bc9df336f0a74751 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomConfig.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI.AppFunction
+namespace EOM.TSHotelManagement.FormUI.AppFunction
 {
     partial class FrmRoomConfig
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomConfig.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomConfig.cs
index 8ebf1dd4a2144665b67e5a14230f104dff825b6e..4b5c2a72863bf5dcd8271a74240e7e0dfee90dac 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomConfig.cs
@@ -21,13 +21,13 @@
  *SOFTWARE.
  *
  */
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.Common.Util;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.Common.Util;
 using jvncorelib.EntityLib;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI.AppFunction
+namespace EOM.TSHotelManagement.FormUI.AppFunction
 {
     public partial class FrmRoomConfig : UIForm
     {
@@ -41,7 +41,7 @@ namespace EOM.TSHotelManager.FormUI.AppFunction
 
         public void LoadRoomType()
         {
-            result = HttpHelper.Request("RoomType/SelectRoomTypesAll", null);
+            result = HttpHelper.Request("RoomType/SelectRoomTypesAll");
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomTypesAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -63,7 +63,7 @@ namespace EOM.TSHotelManager.FormUI.AppFunction
             {
                 { "roomTypeId",txtRoomTypeId.IntValue.ToString()}
             };
-            var result = HttpHelper.Request("RoomType/SelectRoomTypeByType", null, dic);
+            var result = HttpHelper.Request("RoomType/SelectRoomTypeByType", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomTypeByType+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomConfig.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomConfig.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomConfig.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.Designer.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.Designer.cs
index eb21f9c6e6b2eb25c905c5730a320916bddab35f..ce9636ae37cc0ce10bbaffad354ec8bf68da4fed 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmRoomManager
     {
@@ -52,7 +52,7 @@
             flpRoom.Location = new Point(265, 103);
             flpRoom.Margin = new Padding(4);
             flpRoom.Name = "flpRoom";
-            flpRoom.Size = new Size(804, 383);
+            flpRoom.Size = new Size(804, 516);
             flpRoom.TabIndex = 71;
             // 
             // pnlRoomInfo
@@ -71,7 +71,7 @@
             pnlRoomInfo.Location = new Point(2, 312);
             pnlRoomInfo.Margin = new Padding(4);
             pnlRoomInfo.Name = "pnlRoomInfo";
-            pnlRoomInfo.Size = new Size(255, 174);
+            pnlRoomInfo.Size = new Size(255, 307);
             pnlRoomInfo.TabIndex = 72;
             // 
             // lblRoomState
@@ -220,7 +220,7 @@
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = Color.FromArgb(235, 243, 255);
             BackgroundImageLayout = ImageLayout.Stretch;
-            ClientSize = new Size(1072, 490);
+            ClientSize = new Size(1072, 623);
             Controls.Add(muRoomState);
             Controls.Add(flpRoomTypes);
             Controls.Add(pnlRoomInfo);
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs
index ee4af3c9280ee5f91bd1b42ff5d24e2e9c5bc6a7..4ade855c3d9dbe73e3c3c7797f41c641f2fb3bf2 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomManager.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.cs
@@ -23,13 +23,13 @@
  */
 
 using AntdUI;
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.FormUI.AppUserControls;
-using EOM.TSHotelManager.FormUI.Properties;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.FormUI.AppUserControls;
+using EOM.TSHotelManagement.FormUI.Properties;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmRoomManager : Form
     {
@@ -45,9 +45,12 @@ namespace EOM.TSHotelManager.FormUI
         public static ReadRoomInfo ReadInfo;
         public static ReLoadRoomList Reload;
         public static RefreshRoomCount _RefreshRoomCount;
+
+        private LoadingProgress loadingProgress;
         public FrmRoomManager()
         {
             InitializeComponent();
+            loadingProgress = new LoadingProgress();
             ReadInfo = LoadRoomInfo;
             Reload = LoadData;
             _RefreshRoomCount = LoadRoomTypesAndStates;
@@ -66,10 +69,12 @@ namespace EOM.TSHotelManager.FormUI
         #region 房间加载事件方法
         private void FrmRoomManager_Load(object sender, EventArgs e)
         {
+            loadingProgress.Show();
             LoadRoomInfo();
             LoadRoomTypesAndStates();
             LoadRoomTypes();
             LoadData();
+            loadingProgress.Close();
         }
         #endregion
 
@@ -92,7 +97,7 @@ namespace EOM.TSHotelManager.FormUI
                     { "Room/SelectReseredRoomAllByRoomState", (null, null) }
                 };
 
-                var results = HttpHelper.RaiseRequests(requests);
+                var results = HttpHelper.RaiseBatchRequest(requests);
 
                 if (results["Room/SelectCanUseRoomAllByRoomState"].statusCode != 200)
                 {
@@ -190,7 +195,7 @@ namespace EOM.TSHotelManager.FormUI
             try
             {
                 var dic = new Dictionary<string, string> { { "isDelete", "0" } };
-                var result = HttpHelper.Request("RoomType/SelectRoomTypesAll", null, dic);
+                var result = HttpHelper.Request("RoomType/SelectRoomTypesAll", dic);
                 if (result.statusCode != 200)
                 {
                     throw new Exception("SelectRoomTypesAll+接口服务异常");
@@ -269,7 +274,7 @@ namespace EOM.TSHotelManager.FormUI
                 {
                     { "TypeName",typeName}
                 };
-                result = HttpHelper.Request("Room/SelectRoomByTypeName", null, dic);
+                result = HttpHelper.Request("Room/SelectRoomByTypeName", dic);
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("SelectRoomByTypeName+接口服务异常，请提交Issue或尝试更新版本！");
@@ -301,7 +306,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "stateid",stateid.ToString()}
             };
-            result = HttpHelper.Request("Room/SelectRoomByRoomState", null, dic);
+            result = HttpHelper.Request("Room/SelectRoomByRoomState", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomByRoomState+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomManagement.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomMap.Designer.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomMap.Designer.cs
index c3b1112d963702f54114502704501a0fde17ef41..3aa1d09f5066d9f4c2aa087f54191efb29c9bb38 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomMap.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI.AppFunction
+namespace EOM.TSHotelManagement.FormUI.AppFunction
 {
     partial class FrmRoomMap
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomMap.cs
similarity index 94%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomMap.cs
index 8c629da458becd6bb93d11a9b844205067ab8ca9..09fdeb07f7b9ae303e2bdcc7c9fcce44d88323e3 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomMap.cs
@@ -23,11 +23,11 @@
  */
 
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI.AppFunction
+namespace EOM.TSHotelManagement.FormUI.AppFunction
 {
     public partial class FrmRoomMap : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomMap.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomMap.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomMap.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.Designer.cs
index c7e86e647d32353c1b4dc00de206368fbcbd64cc..e288cfd67a159808a765da8713c612da0018651c 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmRoomStateManager
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.cs
index 1f1915a42e64ec3bff2c9f1cce7b0e84d9d74e56..1a2dc31316f3dcaaeb78aa86d9add79c1ccd4216 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmRoomStateManager : UIForm
     {
@@ -72,7 +72,7 @@ namespace EOM.TSHotelManager.FormUI
                         { "roomno",txtRoomNo.Text},
                         { "stateid",cboState.SelectedIndex.ToString()}
                     };
-                    result = HttpHelper.Request("Room/UpdateRoomStateByRoomNo", null, dic);
+                    result = HttpHelper.Request("Room/UpdateRoomStateByRoomNo", dic);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.ShowError("UpdateRoomStateByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmRoomStateManager.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmRoomStateManagement.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs
index 57234d5009429689d9748551ba25bd33ee57ddf7..937040a6e708c7a33a3a6adf40ff5287e5817d19 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmSelectCustoInfo
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs
index 71e0845a43469e9af0799c5411dad8063c734fdb..18aa716d0abe851db106b9efcf2c38c2e8ecc8d3 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmSelectCustoInfo : UIForm
     {
@@ -101,7 +101,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "CustoNo",txtCustoNo.Text.Trim() }
             };
-            result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo", null, dic);
+            result = HttpHelper.Request("Custo/SelectCardInfoByCustoNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectCardInfoByCustoNo+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSelectCustoInfo.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSelectCustoInfo.resx
diff --git a/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.Designer.cs
new file mode 100644
index 0000000000000000000000000000000000000000..788cc59d07a511f462e4eb2a426f64c51500513a
--- /dev/null
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.Designer.cs
@@ -0,0 +1,406 @@
+namespace EOM.TSHotelManagement.FormUI
+{
+    partial class FrmSellThing
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSellThing));
+            groupBox2 = new GroupBox();
+            txtPrice = new Sunny.UI.UITextBox();
+            uiLabel6 = new Sunny.UI.UILabel();
+            nudNum = new Sunny.UI.UIDoubleUpDown();
+            uiLabel5 = new Sunny.UI.UILabel();
+            txtSellName = new Sunny.UI.UITextBox();
+            uiLabel4 = new Sunny.UI.UILabel();
+            txtSellNo = new Sunny.UI.UITextBox();
+            uiLabel3 = new Sunny.UI.UILabel();
+            label1 = new AntdUI.Label();
+            txtFind = new AntdUI.Input();
+            btnFind = new AntdUI.Button();
+            label2 = new AntdUI.Label();
+            txtRoomNo = new AntdUI.Input();
+            btnCheck = new AntdUI.Button();
+            lblState = new AntdUI.Label();
+            dgvSellthing = new AntdUI.Table();
+            btnPg = new AntdUI.Pagination();
+            btnAdd = new AntdUI.Button();
+            btnCancel = new AntdUI.Button();
+            dgvRoomSell = new AntdUI.Table();
+            groupBox2.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBox2
+            // 
+            groupBox2.Controls.Add(txtPrice);
+            groupBox2.Controls.Add(uiLabel6);
+            groupBox2.Controls.Add(nudNum);
+            groupBox2.Controls.Add(uiLabel5);
+            groupBox2.Controls.Add(txtSellName);
+            groupBox2.Controls.Add(uiLabel4);
+            groupBox2.Controls.Add(txtSellNo);
+            groupBox2.Controls.Add(uiLabel3);
+            groupBox2.Font = new Font("Microsoft Sans Serif", 9F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            groupBox2.Location = new Point(617, 88);
+            groupBox2.Name = "groupBox2";
+            groupBox2.Size = new Size(452, 123);
+            groupBox2.TabIndex = 5;
+            groupBox2.TabStop = false;
+            groupBox2.Text = "订购中心";
+            // 
+            // txtPrice
+            // 
+            txtPrice.Cursor = Cursors.IBeam;
+            txtPrice.Font = new Font("微软雅黑", 12F);
+            txtPrice.Location = new Point(310, 74);
+            txtPrice.Margin = new Padding(4, 5, 4, 5);
+            txtPrice.MinimumSize = new Size(1, 1);
+            txtPrice.Name = "txtPrice";
+            txtPrice.Padding = new Padding(5);
+            txtPrice.Radius = 20;
+            txtPrice.ReadOnly = true;
+            txtPrice.ShowText = false;
+            txtPrice.Size = new Size(116, 29);
+            txtPrice.Style = Sunny.UI.UIStyle.Custom;
+            txtPrice.TabIndex = 30;
+            txtPrice.TextAlignment = ContentAlignment.MiddleLeft;
+            txtPrice.Watermark = "";
+            // 
+            // uiLabel6
+            // 
+            uiLabel6.Font = new Font("微软雅黑", 12F);
+            uiLabel6.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel6.Location = new Point(258, 74);
+            uiLabel6.Name = "uiLabel6";
+            uiLabel6.Size = new Size(61, 29);
+            uiLabel6.Style = Sunny.UI.UIStyle.Custom;
+            uiLabel6.TabIndex = 29;
+            uiLabel6.Text = "单价：";
+            uiLabel6.TextAlign = ContentAlignment.MiddleLeft;
+            // 
+            // nudNum
+            // 
+            nudNum.AutoValidate = AutoValidate.Disable;
+            nudNum.Font = new Font("新宋体", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
+            nudNum.Location = new Point(310, 30);
+            nudNum.Margin = new Padding(4, 5, 4, 5);
+            nudNum.Maximum = 9999D;
+            nudNum.Minimum = 0D;
+            nudNum.MinimumSize = new Size(100, 0);
+            nudNum.Name = "nudNum";
+            nudNum.Radius = 20;
+            nudNum.ShowText = false;
+            nudNum.Size = new Size(116, 29);
+            nudNum.Step = 1D;
+            nudNum.Style = Sunny.UI.UIStyle.Custom;
+            nudNum.StyleCustomMode = true;
+            nudNum.TabIndex = 25;
+            nudNum.Text = null;
+            nudNum.TextAlignment = ContentAlignment.MiddleCenter;
+            nudNum.ValueChanged += nudNum_ValueChanged;
+            // 
+            // uiLabel5
+            // 
+            uiLabel5.Font = new Font("微软雅黑", 12F);
+            uiLabel5.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel5.Location = new Point(258, 30);
+            uiLabel5.Name = "uiLabel5";
+            uiLabel5.Size = new Size(61, 29);
+            uiLabel5.Style = Sunny.UI.UIStyle.Custom;
+            uiLabel5.TabIndex = 28;
+            uiLabel5.Text = "数量：";
+            uiLabel5.TextAlign = ContentAlignment.MiddleLeft;
+            // 
+            // txtSellName
+            // 
+            txtSellName.Cursor = Cursors.IBeam;
+            txtSellName.Font = new Font("微软雅黑", 12F);
+            txtSellName.Location = new Point(107, 74);
+            txtSellName.Margin = new Padding(4, 5, 4, 5);
+            txtSellName.MinimumSize = new Size(1, 1);
+            txtSellName.Name = "txtSellName";
+            txtSellName.Padding = new Padding(5);
+            txtSellName.Radius = 20;
+            txtSellName.ReadOnly = true;
+            txtSellName.ShowText = false;
+            txtSellName.Size = new Size(145, 29);
+            txtSellName.Style = Sunny.UI.UIStyle.Custom;
+            txtSellName.TabIndex = 27;
+            txtSellName.TextAlignment = ContentAlignment.MiddleLeft;
+            txtSellName.Watermark = "";
+            // 
+            // uiLabel4
+            // 
+            uiLabel4.Font = new Font("微软雅黑", 12F);
+            uiLabel4.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel4.Location = new Point(26, 73);
+            uiLabel4.Name = "uiLabel4";
+            uiLabel4.Size = new Size(92, 29);
+            uiLabel4.Style = Sunny.UI.UIStyle.Custom;
+            uiLabel4.TabIndex = 26;
+            uiLabel4.Text = "商品名称：";
+            uiLabel4.TextAlign = ContentAlignment.MiddleLeft;
+            // 
+            // txtSellNo
+            // 
+            txtSellNo.Cursor = Cursors.IBeam;
+            txtSellNo.Font = new Font("微软雅黑", 12F);
+            txtSellNo.Location = new Point(107, 30);
+            txtSellNo.Margin = new Padding(4, 5, 4, 5);
+            txtSellNo.MinimumSize = new Size(1, 1);
+            txtSellNo.Name = "txtSellNo";
+            txtSellNo.Padding = new Padding(5);
+            txtSellNo.Radius = 20;
+            txtSellNo.ReadOnly = true;
+            txtSellNo.ShowText = false;
+            txtSellNo.Size = new Size(145, 29);
+            txtSellNo.Style = Sunny.UI.UIStyle.Custom;
+            txtSellNo.TabIndex = 25;
+            txtSellNo.TextAlignment = ContentAlignment.MiddleLeft;
+            txtSellNo.Watermark = "";
+            // 
+            // uiLabel3
+            // 
+            uiLabel3.Font = new Font("微软雅黑", 12F);
+            uiLabel3.ForeColor = Color.FromArgb(48, 48, 48);
+            uiLabel3.Location = new Point(26, 29);
+            uiLabel3.Name = "uiLabel3";
+            uiLabel3.Size = new Size(92, 29);
+            uiLabel3.Style = Sunny.UI.UIStyle.Custom;
+            uiLabel3.TabIndex = 23;
+            uiLabel3.Text = "商品编号：";
+            uiLabel3.TextAlign = ContentAlignment.MiddleLeft;
+            // 
+            // label1
+            // 
+            label1.BackColor = Color.Transparent;
+            label1.Font = new Font("微软雅黑", 12F);
+            label1.Location = new Point(65, 51);
+            label1.Name = "label1";
+            label1.Size = new Size(125, 23);
+            label1.TabIndex = 26;
+            label1.Text = "要查找的商品：";
+            label1.TextAlign = ContentAlignment.MiddleCenter;
+            // 
+            // txtFind
+            // 
+            txtFind.Font = new Font("微软雅黑", 12F);
+            txtFind.Location = new Point(200, 44);
+            txtFind.Name = "txtFind";
+            txtFind.Size = new Size(197, 38);
+            txtFind.TabIndex = 27;
+            // 
+            // btnFind
+            // 
+            btnFind.Font = new Font("微软雅黑", 12F);
+            btnFind.Location = new Point(407, 44);
+            btnFind.Name = "btnFind";
+            btnFind.Size = new Size(101, 38);
+            btnFind.TabIndex = 28;
+            btnFind.Text = "查     找";
+            btnFind.Type = AntdUI.TTypeMini.Primary;
+            btnFind.Click += btnFind_Click;
+            // 
+            // label2
+            // 
+            label2.BackColor = Color.Transparent;
+            label2.Font = new Font("微软雅黑", 12F);
+            label2.Location = new Point(518, 51);
+            label2.Name = "label2";
+            label2.Size = new Size(92, 23);
+            label2.TabIndex = 29;
+            label2.Text = "消费房号：";
+            label2.TextAlign = ContentAlignment.MiddleCenter;
+            // 
+            // txtRoomNo
+            // 
+            txtRoomNo.Font = new Font("微软雅黑", 12F);
+            txtRoomNo.Location = new Point(620, 44);
+            txtRoomNo.Name = "txtRoomNo";
+            txtRoomNo.Size = new Size(134, 38);
+            txtRoomNo.TabIndex = 30;
+            txtRoomNo.TextChanged += txtRoomNo_TextChanged;
+            txtRoomNo.Validated += txtRoomNo_Validated;
+            // 
+            // btnCheck
+            // 
+            btnCheck.Font = new Font("微软雅黑", 12F);
+            btnCheck.Location = new Point(764, 44);
+            btnCheck.Name = "btnCheck";
+            btnCheck.Size = new Size(101, 38);
+            btnCheck.TabIndex = 31;
+            btnCheck.Text = "可否消费";
+            btnCheck.Type = AntdUI.TTypeMini.Primary;
+            btnCheck.Click += btnCheck_Click;
+            // 
+            // lblState
+            // 
+            lblState.BackColor = Color.Transparent;
+            lblState.Font = new Font("微软雅黑", 12F);
+            lblState.Location = new Point(875, 51);
+            lblState.Name = "lblState";
+            lblState.Size = new Size(130, 23);
+            lblState.TabIndex = 32;
+            lblState.Text = "";
+            lblState.TextAlign = ContentAlignment.MiddleCenter;
+            // 
+            // dgvSellthing
+            // 
+            dgvSellthing.AutoSizeColumnsMode = AntdUI.ColumnsMode.Fill;
+            dgvSellthing.Bordered = true;
+            dgvSellthing.Font = new Font("Microsoft YaHei UI", 9F);
+            dgvSellthing.Location = new Point(4, 88);
+            dgvSellthing.Name = "dgvSellthing";
+            dgvSellthing.Size = new Size(487, 362);
+            dgvSellthing.TabIndex = 131;
+            dgvSellthing.CellClick += dgvSellthing_CellClick;
+            // 
+            // btnPg
+            // 
+            btnPg.Current = 0;
+            btnPg.Font = new Font("微软雅黑", 12F);
+            btnPg.Location = new Point(4, 456);
+            btnPg.Name = "btnPg";
+            btnPg.PageSize = 15;
+            btnPg.ShowSizeChanger = true;
+            btnPg.Size = new Size(487, 31);
+            btnPg.TabIndex = 135;
+            btnPg.Total = 1000000;
+            // 
+            // btnAdd
+            // 
+            btnAdd.Font = new Font("微软雅黑", 12F);
+            btnAdd.Location = new Point(496, 88);
+            btnAdd.Name = "btnAdd";
+            btnAdd.Size = new Size(115, 38);
+            btnAdd.TabIndex = 136;
+            btnAdd.Text = "确定添加";
+            btnAdd.Type = AntdUI.TTypeMini.Primary;
+            btnAdd.Click += btnAdd_Click;
+            // 
+            // btnCancel
+            // 
+            btnCancel.Font = new Font("微软雅黑", 12F);
+            btnCancel.Location = new Point(496, 174);
+            btnCancel.Name = "btnCancel";
+            btnCancel.Size = new Size(115, 38);
+            btnCancel.TabIndex = 137;
+            btnCancel.Text = "撤回添加";
+            btnCancel.Type = AntdUI.TTypeMini.Primary;
+            btnCancel.Click += btnCancel_Click;
+            // 
+            // dgvRoomSell
+            // 
+            dgvRoomSell.AutoSizeColumnsMode = AntdUI.ColumnsMode.Fill;
+            dgvRoomSell.Bordered = true;
+            dgvRoomSell.Font = new Font("Microsoft YaHei UI", 9F);
+            dgvRoomSell.Location = new Point(497, 217);
+            dgvRoomSell.Name = "dgvRoomSell";
+            dgvRoomSell.Size = new Size(572, 270);
+            dgvRoomSell.TabIndex = 138;
+            dgvRoomSell.CellClick += dgvRoomSell_CellClick;
+            // 
+            // FrmSellThing
+            // 
+            AutoScaleMode = AutoScaleMode.None;
+            BackColor = Color.FromArgb(235, 243, 255);
+            ClientSize = new Size(1072, 494);
+            Controls.Add(dgvRoomSell);
+            Controls.Add(btnCancel);
+            Controls.Add(btnAdd);
+            Controls.Add(btnPg);
+            Controls.Add(dgvSellthing);
+            Controls.Add(lblState);
+            Controls.Add(btnCheck);
+            Controls.Add(txtRoomNo);
+            Controls.Add(label2);
+            Controls.Add(btnFind);
+            Controls.Add(txtFind);
+            Controls.Add(label1);
+            Controls.Add(groupBox2);
+            Icon = (Icon)resources.GetObject("$this.Icon");
+            IsForbidAltF4 = true;
+            MaximizeBox = false;
+            MinimizeBox = false;
+            Name = "FrmSellThing";
+            ShowTitleIcon = true;
+            Style = Sunny.UI.UIStyle.Custom;
+            Text = "商品消费";
+            ZoomScaleRect = new Rectangle(15, 15, 1072, 490);
+            Load += FrmSellThing_Load;
+            groupBox2.ResumeLayout(false);
+            ResumeLayout(false);
+        }
+
+        #endregion
+        private System.Windows.Forms.GroupBox groupBox2;
+        //private Sunny.UI.UIDataGridView dgvRoomSell;
+        private Sunny.UI.UITextBox txtPrice;
+        private Sunny.UI.UILabel uiLabel6;
+        private Sunny.UI.UIDoubleUpDown nudNum;
+        private Sunny.UI.UILabel uiLabel5;
+        private Sunny.UI.UITextBox txtSellName;
+        private Sunny.UI.UILabel uiLabel4;
+        private Sunny.UI.UITextBox txtSellNo;
+        private Sunny.UI.UILabel uiLabel3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clRoomNo;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clCustoNo;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendAmount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendPrice;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendMoney;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendNo;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clSellNo;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clSellName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clSellPrice;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clFormat;
+        private System.Windows.Forms.DataGridViewTextBoxColumn clStock;
+        private AntdUI.Label label1;
+        private AntdUI.Input txtFind;
+        private AntdUI.Button btnFind;
+        private AntdUI.Label label2;
+        private AntdUI.Input txtRoomNo;
+        private AntdUI.Button btnCheck;
+        private AntdUI.Label lblState;
+        private AntdUI.Table dgvSellthing;
+        private AntdUI.Pagination btnPg;
+        private AntdUI.Button btnAdd;
+        private AntdUI.Button btnCancel;
+        private AntdUI.Table dgvRoomSell;
+    }
+}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs
similarity index 81%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs
index 029b4477bdfcc84968451d9d2576ab320058d3c2..f58c57b2e5009153af573a1bbcccff5bc15fb861 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.cs
@@ -22,12 +22,13 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.Shared;
 using jvncorelib.EntityLib;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmSellThing : Sunny.UI.UIForm
     {
@@ -38,26 +39,21 @@ namespace EOM.TSHotelManager.FormUI
         ResponseMsg result = null;
         Room r = null;
 
+        private static Spend spend = null;
+
+        private LoadingProgress loadingProgress;
         public FrmSellThing()
         {
             InitializeComponent();
+            loadingProgress = new LoadingProgress();
         }
 
         #region 窗体加载事件
         private void FrmSellThing_Load(object sender, EventArgs e)
         {
-            result = HttpHelper.Request("Room/SelectRoomByStateAll");
-            if (result.statusCode != 200)
-            {
-                UIMessageBox.ShowError("SelectRoomByStateAll+接口服务异常，请提交Issue或尝试更新版本！");
-                return;
-            }
-            List<Room> roms = HttpHelper.JsonToList<Room>(result.message);
-            for (int i = 0; i < roms.Count; i++)
-            {
-                txtRoomNo.AutoCompleteCustomSource.Add(roms[i].RoomNo);
-            }
+            loadingProgress.Show();
             LoadSellThingInfo();
+            loadingProgress.Close();
 
         }
         #endregion
@@ -65,64 +61,106 @@ namespace EOM.TSHotelManager.FormUI
         #region 查询事件
         private void btnFind_Click(object sender, EventArgs e)
         {
-            LoadThingByName();
+            LoadThingByName(txtFind.Text);
         }
         #endregion
 
         #region 查询文本框更改事件
 
-        private void LoadThingByName()
+        private void LoadThingByName(string sellthing)
         {
             dic = new Dictionary<string, string>()
             {
-                { "SellNo",txtFind.Text.Trim()},
-                {"SellName", txtFind.Text.Trim()}
+                { "SellNo",sellthing.Trim()},
+                {"SellName", sellthing.Trim()}
             };
-            result = HttpHelper.Request("Sellthing/SelectSellThingAll", null, dic);
+            result = HttpHelper.Request("Sellthing/SelectSellThingAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！");
                 return;
             }
-            List<SellThing> lstSource = HttpHelper.JsonToList<SellThing>(result.message);
-            this.dgvSellthing.DataSource = lstSource;
-            this.dgvSellthing.AutoGenerateColumns = false;
+
+            var listTableSource = new List<AntdUI.AntItem[]>();
+
+            List<SellThing> lstSource = HttpHelper.JsonToList<SellThing>(result.message!) ?? new List<SellThing>();
+
+            TableComHelper tableComHelper = new TableComHelper();
+            listTableSource = tableComHelper.ConvertToAntdItems(lstSource);
+
+            dgvSellthing.Spin("正在加载中...", config =>
+            {
+                this.dgvSellthing.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns<SellThing>());
+                this.dgvSellthing.DataSource = lstSource;
+            }, () =>
+            {
+                System.Diagnostics.Debug.WriteLine("加载结束");
+            });
         }
         #endregion
 
         #region 根据客户编号加载消费信息的方法
         private void LoadSpendInfoByRoomNo(string room)
         {
-            dic = new Dictionary<string, string>()
+            dgvRoomSell.Spin("正在加载中...", config =>
             {
-                { "No",room}
-            };
-            result = HttpHelper.Request("Spend/SelectSpendByRoomNo", null, dic);
-            if (result.statusCode != 200)
+                dic = new Dictionary<string, string>()
+                {
+                    { "No",room}
+                };
+                result = HttpHelper.Request("Spend/SelectSpendByRoomNo",dic);
+                if (result.statusCode != 200)
+                {
+                    UIMessageBox.ShowError("SelectSpendByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
+                    return;
+                }
+                List<Spend> lstSource = HttpHelper.JsonToList<Spend>(result.message!) ?? new List<Spend>();
+                TableComHelper tableComHelper = new TableComHelper();
+                dgvRoomSell.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns<Spend>());
+                dgvRoomSell.DataSource = tableComHelper.ConvertToAntdItems(lstSource);
+            }, () =>
             {
-                UIMessageBox.ShowError("SelectSpendByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
-                return;
-            }
-            this.dgvRoomSell.AutoGenerateColumns = false;
-            List<Spend> lstSource = HttpHelper.JsonToList<Spend>(result.message);
-            this.dgvRoomSell.DataSource = lstSource;
+                System.Diagnostics.Debug.WriteLine("加载结束");
+            });
         }
         #endregion
 
         #region 商品加载事件方法
         public void LoadSellThingInfo()
+        {
+            var dataCount = 0;
+            btnPg.PageSizeOptions = new int[] { 15, 30, 50, 100 };
+            dgvSellthing.Spin("正在加载中...", config =>
+            {
+                TableComHelper tableComHelper = new TableComHelper();
+                dgvSellthing.Columns = tableComHelper.ConvertToAntdColumns(tableComHelper.GenerateDataColumns<SellThing>());
+                dgvSellthing.DataSource = GetPageData(btnPg.Current, btnPg.PageSize, ref dataCount);
+                btnPg.PageSize = 15;
+                btnPg.Current = 1;
+                btnPg.Total = dataCount;
+            });
+
+        }
+
+        object GetPageData(int current, int pageSize, ref int totalCount)
         {
             result = HttpHelper.Request("Sellthing/SelectSellThingAll");
             if (result.statusCode != 200)
             {
-                UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！");
-                return;
+                AntdUI.Message.error(this, "SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！");
+                return null!;
             }
             List<SellThing> lstSource = HttpHelper.JsonToList<SellThing>(result.message);
-            this.dgvSellthing.AutoGenerateColumns = false;
-            this.dgvSellthing.DataSource = lstSource;
+            totalCount = lstSource.Count;
+            lstSource = lstSource.Skip((current - 1) * pageSize).Take(pageSize).ToList();
+            var listTableSource = new List<AntdUI.AntItem[]>();
+
+            TableComHelper tableComHelper = new TableComHelper();
+            listTableSource = tableComHelper.ConvertToAntdItems(lstSource);
 
+            return listTableSource;
         }
+
         #endregion
 
         #region 判断输入的完整性的方法
@@ -183,7 +221,7 @@ namespace EOM.TSHotelManager.FormUI
                     {
                         { "SellNo",txtSellNo.Text.Trim()}
                     };
-                    result = HttpHelper.Request("Sellthing/SelectSellThingAll", null, dic);
+                    result = HttpHelper.Request("Sellthing/SelectSellThingAll", dic);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -194,7 +232,7 @@ namespace EOM.TSHotelManager.FormUI
                     {
                         { "no",txtRoomNo.Text.Trim()}
                     };
-                    result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic);
+                    result = HttpHelper.Request("Room/SelectRoomByRoomNo", dic);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -205,7 +243,7 @@ namespace EOM.TSHotelManager.FormUI
                     {
                         { "RoomNo",txtRoomNo.Text.Trim()}
                     };
-                    result = HttpHelper.Request("Spend/SelectSpendInfoRoomNo", null, dic);
+                    result = HttpHelper.Request("Spend/SelectSpendInfoRoomNo", dic);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.ShowError("SelectSpendInfoRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -359,32 +397,32 @@ namespace EOM.TSHotelManager.FormUI
                 UIMessageBox.Show("请先输入消费的房间！", "提示信息", UIStyle.Red);
                 return;
             }
-            if (dgvRoomSell.SelectedRows.Count > 0)
+            if (dgvRoomSell.SelectedIndex > 0)
             {
-                if (dgvRoomSell.SelectedRows[0].Cells["clSpendName"].Value.ToString().Contains("居住"))
+                if (spend.SpendName.Contains("居住"))
                 {
                     UIMessageBox.Show("此条消费记录为住房记录，无法删除！", "提示信息", UIStyle.Red);
                     return;
                 }
                 if (UIMessageDialog.ShowMessageDialog("你确定要删除该消费记录吗？", UILocalize.WarningTitle, true, Style))
                 {
-                    var spendTime = Convert.ToDateTime(dgvRoomSell.SelectedRows[0].Cells["clSpendTime"].Value.ToString());
-                    string custoNo = dgvRoomSell.SelectedRows[0].Cells["clCustoNo"].Value.ToString();
-                    string name = dgvRoomSell.SelectedRows[0].Cells["clSpendName"].Value.ToString();
-                    string price = dgvRoomSell.SelectedRows[0].Cells["clSpendPrice"].Value.ToString();
+                    var spendTime = spend.SpendTime;
+                    string custoNo = spend.CustoNo;
+                    string name = spend.SpendName;
+                    string price = spend.SpendPrice.ToString("#.00");
                     dic = new Dictionary<string, string>()
                     {
                         { "name",name},
                         { "price",price}
                     };
-                    result = HttpHelper.Request("Sellthing/SelectSellThingByNameAndPrice", null, dic);
+                    result = HttpHelper.Request("Sellthing/SelectSellThingByNameAndPrice", dic);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.ShowError("SelectSellThingByNameAndPrice+接口服务异常，请提交Issue或尝试更新版本！");
                         return;
                     }
-                    SellThing s = HttpHelper.JsonToModel<SellThing>(result.message);
-                    decimal num = Convert.ToDecimal(dgvRoomSell.SelectedRows[0].Cells["clSpendAmount"].Value.ToString());
+                    SellThing s = HttpHelper.JsonToModel<SellThing>(result.message!)!;
+                    decimal num = Convert.ToDecimal(spend.SpendAmount);
                     string Stock = (s.Stock + num).ToString();
                     dic = new Dictionary<string, string>()
                     {
@@ -392,7 +430,7 @@ namespace EOM.TSHotelManager.FormUI
                         { "custoNo",custoNo},
                         { "sellName",name}
                     };
-                    result = HttpHelper.Request("Sellthing/DeleteSellThing", null, dic);
+                    result = HttpHelper.Request("Sellthing/DeleteSellThing", dic);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.ShowError("DeleteSellThing+接口服务异常，请提交Issue或尝试更新版本！");
@@ -435,14 +473,7 @@ namespace EOM.TSHotelManager.FormUI
 
         private void dgvSellthing_CellClick(object sender, DataGridViewCellEventArgs e)
         {
-            if (lblState.Visible == false)
-            {
-                UIMessageBox.Show("请先输入消费的房间！", "提示信息", UIStyle.Red);
-                return;
-            }
-            txtSellNo.Text = dgvSellthing.SelectedRows[0].Cells["clSellNo"].Value.ToString();
-            txtSellName.Text = dgvSellthing.SelectedRows[0].Cells["clSellName"].Value.ToString();
-            txtPrice.Text = dgvSellthing.SelectedRows[0].Cells["clSellPrice"].Value.ToString();
+
         }
 
 
@@ -476,7 +507,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "no",room}
             };
-            result = HttpHelper.Request("Room/SelectRoomByRoomNo", null, dic);
+            result = HttpHelper.Request("Room/SelectRoomByRoomNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectRoomByRoomNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -512,20 +543,38 @@ namespace EOM.TSHotelManager.FormUI
                     lblState.Text = "该房间不可消费";
                     lblState.ForeColor = Color.Red;
                     rs = 0;
-                    //LoadSpendInfo();
-                    //清空
                 }
             }
         }
 
-        private void lblState_Click(object sender, EventArgs e)
+        private void dgvSellthing_CellClick(object sender, AntdUI.TableClickEventArgs e)
         {
-
+            if (lblState.Visible == false)
+            {
+                UIMessageBox.Show("请先输入消费的房间！", "提示信息", UIStyle.Red);
+                return;
+            }
+            if (e.Record is IList<AntdUI.AntItem> data)
+            {
+                txtSellNo.Text = data[0].value.ToString();
+                txtSellName.Text = data[1].value.ToString();
+                txtPrice.Text = data[2].value.ToString(); ;
+            }
         }
 
-        private void FrmSellThing_Activated(object sender, EventArgs e)
+        private void dgvRoomSell_CellClick(object sender, AntdUI.TableClickEventArgs e)
         {
-
+            if (e.Record is IList<AntdUI.AntItem> data)
+            {
+                spend = new Spend();
+                spend.RoomNo = data[0].value.ToString();
+                spend.CustoNo = data[1].value.ToString();
+                spend.SpendName = data[2].value.ToString();
+                spend.SpendAmount = Convert.ToInt32(data[3].value);
+                spend.SpendPrice = Convert.ToDecimal(data[4].value);
+                spend.SpendMoney = Convert.ToDecimal(data[5].value);
+                spend.SpendTime = Convert.ToDateTime(data[6].value);
+            }
         }
     }
 }
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.resx
similarity index 61%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.resx
index 000822a1e3f8ec3188a53c7a474cd223653256c7..3a815f4b4dfd7e01f3094c77a9aa3eacf87c84c8 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.resx
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThing.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -117,61 +117,19 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="CustoNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CustoName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CustoSex.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CustoTel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CustoBirth.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="typeName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="PassportName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CustoAdress.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="cmsCustoManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>179, 17</value>
-  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAICAAAAEAGAA4AgAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz
+        UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAABzUlEQVRYR+2WPyxD
+        URTGG5MYWAy1SCWCRWKRYCqzyWIQgwQJ6VKLwWJHIpHGQEhEYiQiEYmktRjExmYwMWAwVWIovxvntcfT
+        P/e2z5NIX/IN975zvu9755x720ik/tQrIBXI5XJXH76HvdvQCoTYut+AWbPfEYoJhCZA2oNnhvV0KAa0
+        COI9CGelAgehGzCCGLgUA09/ZSCl2tAZugkqMKMMJI0B1vEgYPUxZg6UgRNpy2axk+K412RlQARvZA7e
+        ZD3kKPYtnKq+W4uL4J5iaK+hDR7NtauBhGrDglNy4YYdVBzbThwktqoKZJySCwYWFcesMwd9u/cInJO/
+        7hM9uH3OHBAcqi+I2hAQ30LeAJgCpzLIjza5P2IgGFc9TPgDeBclZhjMgw1wwd6r/7Swf1aVAZl8jy8D
+        0SRYA+fg2eZYEncHVqo2QPKLpVDWVMD0HSTBKOgmt6FqcbkPtoqU9AHyI7AExkAvMY01CZVKhnwE7IA5
+        0A+af0WoTlqpAvQ4Rvl3zXCViyVu2aASn/N7hPO3IgLxYgTE7Kt749hZpMwgdumTYCpRwkDeJDHB/p2D
+        MC3XqhGJlTCwqiqQCqwCHhHkFX9QZFbaAhf/l4SfVRCNgJ8sOisAAAAASUVORK5CYII=
+</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThingManagement.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThingManagement.Designer.cs
index 9bd1c21684b567247f6aa9b5f9e868d73f96341d..d18251fc98881b41662f9302d7af09043cc89af6 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThingManagement.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmSellThingManager
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThingManagement.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThingManagement.cs
index 27df2e748b2e533ba095d60bb482fc2f0538a80e..84f7110267b1f86b40c4994e4873c69e95dc28ef 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThingManagement.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmSellThingManager : UIForm
     {
@@ -66,7 +66,7 @@ namespace EOM.TSHotelManager.FormUI
                 {"SellNo",txtFind.Text.Trim() },
                 { "SellName",txtFind.Text.Trim()}
             };
-            result = HttpHelper.Request("Sellthing/SelectSellThingAll", null, dic);
+            result = HttpHelper.Request("Sellthing/SelectSellThingAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectSellThingAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -81,7 +81,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "sellNo",txtSellNo.Text.Trim()}
             };
-            result = HttpHelper.Request("Sellthing/DeleteSellThingBySellNo", null, dic);
+            result = HttpHelper.Request("Sellthing/DeleteSellThingBySellNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("DeleteSellThingBySellNo+接口服务异常，请提交Issue或尝试更新版本！");
@@ -133,7 +133,7 @@ namespace EOM.TSHotelManager.FormUI
                 {
                     { "SellNo",st.SellNo}
                 };
-                result = HttpHelper.Request("Sellthing/SelectSellInfoBySellNo", null, dic);
+                result = HttpHelper.Request("Sellthing/SelectSellInfoBySellNo", dic);
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("SelectSellInfoBySellNo+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThingManagement.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSellThingManager.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSellThingManagement.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSexType.Designer.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSexType.Designer.cs
index ce8475d2d6ae7446a972d0dee93e2166265299b3..2d447ad7a263fa86cefa013c67312b94867b950a 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSexType.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmSexType
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSexType.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSexType.cs
index ffa64f785a4042323de4e9006df740562a2586ba..b821115e5d67a80f085b61f1c208155797bd0fea 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSexType.cs
@@ -24,7 +24,7 @@
 
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmSexType : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmSexType.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmSexType.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmSexType.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmUnLockSystem.Designer.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmUnLockSystem.Designer.cs
index 72d2e135e95916d11622f26cd159b3a6d5e607d5..285b969ce9789b8de527b834ecaa6f511fdf2801 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmUnLockSystem.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmUnLockSystem
     {
@@ -85,7 +85,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackgroundImage = global::EOM.TSHotelManager.FormUI.Properties.Resources.jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018_jpg_w1024_new_small;
+            this.BackgroundImage = global::EOM.TSHotelManagement.FormUI.Properties.Resources.jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018_jpg_w1024_new_small;
             this.ClientSize = new System.Drawing.Size(498, 179);
             this.Controls.Add(this.btnUnLock);
             this.Controls.Add(this.txtUnLockPwd);
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmUnLockSystem.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmUnLockSystem.cs
index 3d5ac9429634ac6903e06fa4838f093d4044f59a..1e0df29c5e2d4725bf19905b0eb56e8398f46e51 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmUnLockSystem.cs
@@ -22,13 +22,13 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmUnLockSystem : UIForm
     {
@@ -75,7 +75,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "account",AdminInfo.Account.Trim()}
             };
-            result = HttpHelper.Request("Admin/SelectAdminPwdByAccount", null, dic);
+            result = HttpHelper.Request("Admin/SelectAdminPwdByAccount", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectAdminPwdByAccount+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmUnLockSystem.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmUnLockSystem.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmUnLockSystem.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmUpLoadNotice.Designer.cs
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmUpLoadNotice.cs
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmUpLoadNotice.cs
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmUpLoadNotice.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmUpLoadNotice.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmUpLoadNotice.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmVipRule.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmVipRule.Designer.cs
index 758c211434b7d3612d1bf24bc65462e6090b4f9c..02f8cbd9802f81f28c9439ec7e8abde1632bfbd1 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmVipRule.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmVipRule
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmVipRule.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmVipRule.cs
index 45fffe10596d3e9fcbaaadbfa54d992c443ec032..6ad2406f70855fa5bdd4b35b8d2afb1945dafd98 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmVipRule.cs
@@ -22,12 +22,12 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.FormUI.Properties;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.FormUI.Properties;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmVipRule : UIForm
     {
@@ -41,7 +41,7 @@ namespace EOM.TSHotelManager.FormUI
         private void FrmVipRule_Load(object sender, EventArgs e)
         {
             #region 加载客户类型信息
-            result = HttpHelper.Request("Base/SelectCustoTypeAllCanUse", null, null);
+            result = HttpHelper.Request("Base/SelectCustoTypeAllCanUse");
             if (result.statusCode != 200)
             {
                 UIMessageTip.ShowError("SelectCustoTypeAllCanUse+接口服务异常，请提交issue");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmVipRule.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmVipRule.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmVipRule.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWoEInfo.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWoEInfo.Designer.cs
index 97a6d47cc60fc4babd86018b2d92b7d1700b984b..6039f5065b0d78003bed40fe9366fe150e249a96 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWoEInfo.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmWoEInfo
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWoEInfo.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWoEInfo.cs
index b6628f0132406b3a812de3cbdbb47ddcf0ea0de1..38b71a9daf9dbc2377ba3482f00c19749ab46d9a 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWoEInfo.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmWoEInfo : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWoEInfo.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWoEInfo.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWoEInfo.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs
index 1b0bebe34f36f6c85980798d74042d7cbdcff696..7740dd54a60509fd3547669457b4a4433bd60a36 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerCheckInfo.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmWorkerCheckInfo
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerCheckInfo.cs
similarity index 94%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerCheckInfo.cs
index 13e5de2ec56ed3a1442a3311b7887a74b9e1f8d2..b8cd26eb05319d2f6ae70489d47e0ba74f30a31e 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerCheckInfo.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmWorkerCheckInfo : UIForm
     {
@@ -46,7 +46,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "wid",FrmWorkerPanel.wk_WorkerNo}
             };
-            result = HttpHelper.Request("WorkerCheck/SelectCheckInfoByWorkerNo", null, dic);
+            result = HttpHelper.Request("WorkerCheck/SelectCheckInfoByWorkerNo", dic);
             if (result.statusCode != 200)
             {
                 UIMessageTip.ShowError("SelectCheckInfoByWorkerNo+接口服务异常，请提交issue");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerCheckInfo.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerCheckInfo.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerCheckInfo.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerInfo.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerInfo.Designer.cs
index 8da9e486cd75ad0b2107d8a54b69ecdf5d644c83..bd898f4407a026fb7e86da1aa81c4254e74cfacd 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerInfo.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmWorkerInfo
     {
@@ -486,7 +486,7 @@
             // picWorkerPic
             // 
             this.picWorkerPic.BackColor = System.Drawing.Color.Transparent;
-            this.picWorkerPic.BackgroundImage = global::EOM.TSHotelManager.FormUI.Properties.Resources.上传照片;
+            this.picWorkerPic.BackgroundImage = global::EOM.TSHotelManagement.FormUI.Properties.Resources.上传照片;
             this.picWorkerPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.picWorkerPic.Location = new System.Drawing.Point(614, 38);
             this.picWorkerPic.Name = "picWorkerPic";
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerInfo.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerInfo.cs
index eab5f26bf5bb6cbe8a51e9473abbf93347a2d0c3..b45a2debab7a03c41bd6ec5713dc6623998d608d 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerInfo.cs
@@ -22,12 +22,12 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using jvncorelib.EncryptorLib;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmWorkerInfo : UIEditForm
     {
@@ -61,7 +61,7 @@ namespace EOM.TSHotelManager.FormUI
             //加载民族信息
             Dictionary<string, string> dic = new Dictionary<string, string>();
             dic.Add("delete_mk", "0");
-            result = HttpHelper.Request("Base/SelectNationAll", null, dic);
+            result = HttpHelper.Request("Base/SelectNationAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectNationAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -73,7 +73,7 @@ namespace EOM.TSHotelManager.FormUI
             //加载职位信息
             dic = new Dictionary<string, string>();
             dic.Add("delete_mk", "0");
-            result = HttpHelper.Request("Base/SelectPositionAll", null, dic);
+            result = HttpHelper.Request("Base/SelectPositionAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectPositionAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -85,7 +85,7 @@ namespace EOM.TSHotelManager.FormUI
             //加载性别信息
             dic = new Dictionary<string, string>();
             dic.Add("delete_mk", "0");
-            result = HttpHelper.Request("Base/SelectSexTypeAll", null, dic);
+            result = HttpHelper.Request("Base/SelectSexTypeAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectSexTypeAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -97,7 +97,7 @@ namespace EOM.TSHotelManager.FormUI
             //加载学历信息
             dic = new Dictionary<string, string>();
             dic.Add("delete_mk", "0");
-            result = HttpHelper.Request("Base/SelectEducationAll", null, dic);
+            result = HttpHelper.Request("Base/SelectEducationAll", dic);
             if (result.statusCode != 200)
             {
                 UIMessageBox.ShowError("SelectEducationAll+接口服务异常，请提交Issue或尝试更新版本！");
@@ -148,7 +148,7 @@ namespace EOM.TSHotelManager.FormUI
                 {
                     { "WorkerId", WorkerNo.Text.Trim() }
                 };
-                result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic);
+                result = HttpHelper.Request("WorkerPicture/WorkerPic", dic);
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！");
@@ -165,7 +165,7 @@ namespace EOM.TSHotelManager.FormUI
                 this.WorkerID.Validated -= new EventHandler(WorkerID_Validated);
                 dic = new Dictionary<string, string>();
                 dic.Add("wid", WorkerNo.Text.Trim());
-                result = HttpHelper.Request("WorkerHistory/SelectHistoryByWorkerId", null, dic);
+                result = HttpHelper.Request("WorkerHistory/SelectHistoryByWorkerId", dic);
                 if (result.statusCode != 200)
                 {
                     UIMessageBox.ShowError("SelectHistoryByWorkerId+接口服务异常，请提交Issue或尝试更新版本！");
@@ -222,7 +222,7 @@ namespace EOM.TSHotelManager.FormUI
 
                     dic = new Dictionary<string, string>();
                     dic.Add("WorkerId", WorkerNo.Text.Trim());
-                    result = HttpHelper.Request("WorkerPicture/WorkerPic", null, dic);
+                    result = HttpHelper.Request("WorkerPicture/WorkerPic", dic);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.ShowError("WorkerPic+接口服务异常，请提交Issue或尝试更新版本！");
@@ -243,7 +243,7 @@ namespace EOM.TSHotelManager.FormUI
                     cboWorkerFace.ReadOnly = false;
                     dic = new Dictionary<string, string>();
                     dic.Add("wid", WorkerNo.Text.Trim());
-                    result = HttpHelper.Request("WorkerHistory/SelectHistoryByWorkerId", null, dic);
+                    result = HttpHelper.Request("WorkerHistory/SelectHistoryByWorkerId", dic);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.ShowError("SelectHistoryByWorkerId+接口服务异常，请提交Issue或尝试更新版本！");
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerInfo.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerInfo.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerInfo.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerManagement.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerManagement.Designer.cs
index 40ce454e3f84413f47667bcef8576a8ade4a8adf..8e0fd1bc809a2474fdeb5d13e8d5710f37da8d8b 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerManagement.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmWorkerManager
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerManagement.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerManagement.cs
index 75e0f1c1acc200c1a9fa49d688f2194f7e809ec4..172e9f61e8340347a43cb05ceb18b45cf4737e54 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerManagement.cs
@@ -22,11 +22,11 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmWorkerManager : UIForm
     {
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerManagement.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerManager.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerManagement.resx
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.Designer.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerPanel.Designer.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerPanel.Designer.cs
index 6b912565a95ca28fd33d7dc54739c07361743b9e..bc3aa7bd3936d311e102526688f781362cb8e4ce 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerPanel.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmWorkerPanel
     {
@@ -149,7 +149,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.BackgroundImage = global::EOM.TSHotelManager.FormUI.Properties.Resources.常规部门卡片;
+            this.BackgroundImage = global::EOM.TSHotelManagement.FormUI.Properties.Resources.常规部门卡片;
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.ClientSize = new System.Drawing.Size(375, 239);
             this.Controls.Add(this.btnBlockAccount);
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerPanel.cs
similarity index 98%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerPanel.cs
index ddb6567c8ab529930c187c058de0ace18cf75f07..ff7409349f2f6ea8ca42f7b23567c7259d36a40d 100644
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.cs
+++ b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerPanel.cs
@@ -22,12 +22,12 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.FormUI.Properties;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.FormUI.Properties;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     /// <summary>
     /// 员工操作界面
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.resx b/EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerPanel.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppFunction/FrmWorkerPanel.resx
rename to EOM.TSHotelManagement.FormUI/AppFunction/FrmWorkerPanel.resx
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.Designer.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmAdminEnter.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmAdminEnter.Designer.cs
index b39bf0af5e893ba72d63a7f5241677223f9a8382..b62e4d231889247926eab9b2ba4aaec84166c53b 100644
--- a/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmAdminEnter.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmAdminEnter
     {
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmAdminEnter.cs
similarity index 94%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmAdminEnter.cs
index 02b3461ad4d815caa5e755e747fd2a0a43ae4372..43abc7c5efa1484a57cd8c3eb4502cb0df4601f9 100644
--- a/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.cs
+++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmAdminEnter.cs
@@ -22,21 +22,21 @@
  *
  */
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using jvncorelib.EncryptorLib;
 using Sunny.UI;
 using System.Text.RegularExpressions;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmAdminEnter : UIForm
     {
-        private LoadingProgress _loadingProgress;
-        public FrmAdminEnter()
+        private FrmLogin returnForm1 = null;
+        public FrmAdminEnter(FrmLogin F1)
         {
             InitializeComponent();
-            _loadingProgress = new LoadingProgress();
+            this.returnForm1 = F1;
         }
 
         Dictionary<string, string> dic = null;
@@ -44,8 +44,6 @@ namespace EOM.TSHotelManager.FormUI
 
         private void btnCheckIn_Click(object sender, EventArgs e)
         {
-            _loadingProgress.Show();
-
             string account = txtAccount.Text.Trim();//获取超管账号
             string pass = txtPassword.Text.Trim();//获取超管密码
             if (!CheckInputString(account, pass))
@@ -79,7 +77,7 @@ namespace EOM.TSHotelManager.FormUI
                 #region 获取添加操作日志所需的信息
                 RecordHelper.Record(AdminInfo.Account + "-" + AdminInfo.Name + "在" + Convert.ToDateTime(DateTime.Now) + "位于" + AdminInfo.SoftwareVersion + "版本登入了后台管理系统！", 3);
                 #endregion
-                FrmBackgroundSystem fm = new FrmBackgroundSystem(this, _loadingProgress);
+                FrmBackgroundSystem fm = new FrmBackgroundSystem(this);
                 this.Hide();//隐藏登录窗体
                 fm.ShowDialog(this);//打开主窗体
 
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.resx b/EOM.TSHotelManagement.FormUI/AppInterface/FrmAdminEnter.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmAdminEnter.resx
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmAdminEnter.resx
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.Designer.cs
index a972fe173fe379ecd5b57a287e985d372bc964e9..7819869217f59e7e82d4a3d0703340afb72991ee 100644
--- a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmLoading
     {
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs
similarity index 85%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs
index 823fe934bd02ce0e8dc62365641bf6631d540b14..83caedfb7c1ce3340cba0ea53b8c5bab24c2e727 100644
--- a/EOM.TSHotelManager.FormUI/AppInterface/FrmLoading.cs
+++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.cs
@@ -21,14 +21,15 @@
  *SOFTWARE.
  *
  */
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
+using AntdUI;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
 using Newtonsoft.Json;
 using Sunny.UI;
 using System.Diagnostics;
 using System.Reflection;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmLoading : UIForm
     {
@@ -37,7 +38,7 @@ namespace EOM.TSHotelManager.FormUI
         private string FileName { get; set; }
         private string CurrentExecutablePath => Application.ExecutablePath;
         private string CurrentExecutableName => Path.GetFileName(CurrentExecutablePath);
-        private string FallbackUrl = "https://pan.gkhive.com/TS%E9%85%92%E5%BA%97%E7%AE%A1%E7%90%86%E7%B3%BB%E7%BB%9F%E7%89%88%E6%9C%AC%E5%BA%93";
+        private string FallbackUrl = "https://pan.gkhive.com/%E6%9C%AC%E5%9C%B0%E7%A3%81%E7%9B%98/blog_files/TS%E9%85%92%E5%BA%97%E7%AE%A1%E7%90%86%E7%B3%BB%E7%BB%9F%E7%89%88%E6%9C%AC%E5%BA%93";
 
         private ProgressBar progressBar;
 
@@ -80,40 +81,42 @@ namespace EOM.TSHotelManager.FormUI
                             var isUpdated = await DownloadAndInstallUpdate(updateAsset.BrowserDownloadUrl, updateAsset.Name, new Progress<double>(ReportProgress));
                             if (isUpdated)
                             {
-                                UIMessageBox.ShowWarning("旧版已停止使用，稍后将自动下载最新发行版！");
+                                AntdUI.Modal.open(this, "系统提示", "旧版已停止使用，稍后将自动下载最新发行版！", TType.Warn);
                                 ExitApplication();
                             }
                             else
                             {
-                                UIMessageBox.ShowWarning("更新失败，请手动下载最新版本。");
+                                AntdUI.Modal.open(this, "系统提示", "更新失败，请手动下载最新版本。", TType.Warn);
                             }
                         }
                         else
                         {
-                            UIMessageBox.ShowWarning("最新版本中未找到可更新的 .exe 文件。");
+                            AntdUI.Modal.open(this, "系统提示", "最新版本中未找到可更新的 .exe 文件。", TType.Warn);
                         }
                     }
                     else
                     {
-                        UIMessageBox.ShowSuccess("当前已为最新版本，无需更新！");
+                        AntdUI.Modal.open(this, "系统提示", "当前已为最新版本，无需更新！", TType.Success);
                         await Task.Run(() => threadPro());
                     }
                 }
                 else
                 {
-                    UIMessageBox.Show("无法获取最新版本信息，请检查网络连接。");
+                    AntdUI.Modal.open(this, "系统提示", "无法获取最新版本信息，请检查网络连接。", TType.Info);
                     ExitApplication();
                 }
             }
             catch (OperationCanceledException)
             {
-                UIMessageBox.Show("网络连接超时，无法检查更新。即将跳转到网盘版本库");
+                AntdUI.Modal.open(this, "系统提示", "网络连接超时，无法检查更新。即将跳转到网盘版本库", TType.Info);
                 OpenFallbackUrl();
                 ExitApplication();
             }
             catch (Exception ex)
             {
-                UIMessageBox.Show($"检查更新时发生错误: {ex.Message}");
+                AntdUI.Modal.open(this, "系统提示", $"检查更新时发生错误: {ex.Message}", TType.Info);
+                OpenFallbackUrl();
+                ExitApplication();
             }
         }
 
@@ -175,12 +178,12 @@ namespace EOM.TSHotelManager.FormUI
             }
             catch (OperationCanceledException)
             {
-                UIMessageBox.Show("网络连接超时，无法下载更新。");
+                AntdUI.Modal.open(this, "系统提示", "网络连接超时，无法下载更新。", TType.Info);
                 OpenFallbackUrl();
             }
             catch (Exception ex)
             {
-                UIMessageBox.Show($"下载更新时发生错误: {ex.Message}");
+                AntdUI.Modal.open(this, "系统提示", $"下载更新时发生错误: {ex.Message}", TType.Info);
                 OpenFallbackUrl();
             }
             return false;
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucCustomProgressBar.resx b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucCustomProgressBar.resx
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmLoading.resx
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.Designer.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs
index 8cb726db310e4300e0391dc5f67217cdfc6aeaa2..ea5b085c9ca2ff9411492a644c0ec089859b1391 100644
--- a/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmLogin
     {
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs
similarity index 81%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs
index 04e8630b03ec42eeedbc7512c920f5f7119e8e71..0ea179698b98f4e8650f0df648d8b3e3446c8323 100644
--- a/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.cs
+++ b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.cs
@@ -23,12 +23,14 @@
  */
 
 using AntdUI;
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.FormUI.Properties;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.FormUI.Properties;
+using jvncorelib.EntityLib;
 using Sunny.UI;
+using System.Windows.Forms;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmLogin : Window
     {
@@ -157,7 +159,7 @@ namespace EOM.TSHotelManager.FormUI
             _loadingProgress.Show();
             try
             {
-                if (CheckInput())//检验输入完整性
+                if (CheckInput())
                 {
                     Worker worker = new Worker() { WorkerId = txtWorkerId.Text.Trim(), WorkerPwd = txtWorkerPwd.Text.Trim() };
 
@@ -165,18 +167,18 @@ namespace EOM.TSHotelManager.FormUI
 
                     if (result.statusCode != 200)
                     {
-                        UIMessageBox.Show("账号或密码错误！", "来自小T提示", UIStyle.Red);
-                        txtWorkerPwd.Focus();//聚焦
+                        AntdUI.Modal.open(this, "系统提示", "账号或密码错误！",TType.Error);
+                        txtWorkerPwd.Focus();
                         return;
                     }
 
                     Worker w = HttpHelper.JsonToModel<Worker>(result.message);
 
-                    if (w != null)//判断员工编号是否存在
+                    if (!w.IsNullOrEmpty())
                     {
                         if (w.delete_mk == 1)
                         {
-                            UIMessageBox.Show("账号已禁用，请联系上级解封！", "来自小T提示", UIStyle.Red);
+                            AntdUI.Modal.open(this, "系统提示", "账号已禁用，请联系上级解封！", TType.Error);
                             return;
                         }
 
@@ -187,47 +189,28 @@ namespace EOM.TSHotelManager.FormUI
                         LoginInfo.SoftwareVersion = ApplicationUtil.GetApplicationVersion().ToString();
                         LoginInfo.UserToken = w.user_token;
                         FrmMain frm = new FrmMain(this, _loadingProgress);
-                        this.Hide();//隐藏登录窗体
-                        frm.ShowDialog(this);//打开主窗体
+                        this.Hide();
+                        frm.TopMost = true;
+                        frm.ShowDialog(this);
                     }
                     else
                     {
-                        UIMessageBox.Show("密码错误！", "来自小T提示", UIStyle.Red);
-                        txtWorkerPwd.Focus();//聚焦
+                        AntdUI.Modal.open(this, "系统提示", "密码错误！", TType.Error);
+                        txtWorkerPwd.Focus();
                     }
                 }
             }
             catch (Exception ex)
             {
-                //Console.WriteLine(ex);
-                UIMessageBox.Show("服务器维护中，请稍后再试！", "温馨提示", UIStyle.Red);
-            }
-            finally
-            {
+                AntdUI.Modal.open(this, "系统提示", "服务器维护中，请稍后再试！", TType.Error);
             }
         }
         #endregion
 
         private void btnLoginBackSystem_Click(object sender, EventArgs e)
         {
-            FrmAdminEnter frmAdminEnter = new FrmAdminEnter();
+            FrmAdminEnter frmAdminEnter = new FrmAdminEnter(this);
             frmAdminEnter.ShowDialog(this);
         }
-
-        private void picFormSize_MouseDown(object sender, MouseEventArgs e)
-        {
-            this.picFormSize.BackColor = System.Drawing.Color.RoyalBlue;
-        }
-
-        private void picFormSize_MouseHover(object sender, EventArgs e)
-        {
-            this.picFormSize.BackColor = System.Drawing.Color.RoyalBlue;
-        }
-
-        private void picFormSize_MouseLeave(object sender, EventArgs e)
-        {
-            this.picFormSize.BackColor = System.Drawing.Color.Transparent;
-            this.picFormSize.BackgroundImage = Resources.arrow_down_b;
-        }
     }
 }
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.resx b/EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmLogin.resx
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmLogin.resx
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.Designer.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmNewLogin.Designer.cs
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmNewLogin.Designer.cs
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.cs b/EOM.TSHotelManagement.FormUI/AppInterface/FrmNewLogin.cs
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.cs
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmNewLogin.cs
diff --git a/EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.resx b/EOM.TSHotelManagement.FormUI/AppInterface/FrmNewLogin.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppInterface/FrmNewLogin.resx
rename to EOM.TSHotelManagement.FormUI/AppInterface/FrmNewLogin.resx
diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs b/EOM.TSHotelManagement.FormUI/AppMain/FrmBackgroundSystem.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppMain/FrmBackgroundSystem.Designer.cs
index edb5a873dcb1efb5eac2ecfbfd3bb4b01e99f700..dcc05b23bd776a818d30c9718ea494045067029d 100644
--- a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppMain/FrmBackgroundSystem.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmBackgroundSystem
     {
diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs b/EOM.TSHotelManagement.FormUI/AppMain/FrmBackgroundSystem.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs
rename to EOM.TSHotelManagement.FormUI/AppMain/FrmBackgroundSystem.cs
index 87c82da43768926b324c8876d746acfe630a2ae2..f36161f33273c6c6f97f057fc59b89d88ce4023e 100644
--- a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.cs
+++ b/EOM.TSHotelManagement.FormUI/AppMain/FrmBackgroundSystem.cs
@@ -23,12 +23,12 @@
  */
 
 
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.FormUI.AppFunction;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.FormUI.AppFunction;
 using Sunny.UI;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmBackgroundSystem : UIForm
     {
@@ -42,10 +42,9 @@ namespace EOM.TSHotelManager.FormUI
 
         public static UpdPwd hideform;
 
-        public FrmBackgroundSystem(FrmAdminEnter F1, LoadingProgress loadingProgress)
+        public FrmBackgroundSystem(FrmAdminEnter F1)
         {
             InitializeComponent();
-            _loadingProgress = loadingProgress;
 
             this.returnForm1 = F1;
 
@@ -84,12 +83,6 @@ namespace EOM.TSHotelManager.FormUI
             {//下午
                 uiLabel1.Text = "下午好," + AdminInfo.Name;
             }
-
-            if (_loadingProgress != null)
-            {
-                _loadingProgress.Close();
-            }
-
         }
 
         /// <summary>
@@ -102,7 +95,6 @@ namespace EOM.TSHotelManager.FormUI
 
         private void Aside_MenuItemClick(TreeNode node, NavMenuItem item, int pageIndex)
         {
-            _loadingProgress.Show();
             if (!node.Text.IsNullOrEmpty())
             {
                 switch (node.Text)
@@ -165,7 +157,7 @@ namespace EOM.TSHotelManager.FormUI
                     case "监管统计":
                         break;
                     case "监管部门情况":
-                        if (AdminInfo.isAdmin == true || AdminInfo.Type.Equals("GeneralManager") || AdminInfo.Type.Equals("CheckGroup"))
+                        if (AdminInfo.isAdmin == true || AdminInfo.Type.Equals(AdminConstant.GeneralManager.Code) || AdminInfo.Type.Equals(AdminConstant.CheckGroup.Code))
                         {
                             pnlForm.Controls.Clear();
                             FrmCheckList frmCheckList = new FrmCheckList();
@@ -176,7 +168,7 @@ namespace EOM.TSHotelManager.FormUI
                         }
                         else
                         {
-                            UIMessageTip.ShowWarning("此模块只开放给超级管理员或总经理以及监管小组查看！");
+                            UIMessageTip.ShowWarning("此模块只开放特定权限人员查看！");
                             return;
                         }
                         break;
@@ -292,7 +284,6 @@ namespace EOM.TSHotelManager.FormUI
                         break;
 
                 }
-                _loadingProgress.Close();
             }
         }
 
diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.resx b/EOM.TSHotelManagement.FormUI/AppMain/FrmBackgroundSystem.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppMain/FrmBackgroundSystem.resx
rename to EOM.TSHotelManagement.FormUI/AppMain/FrmBackgroundSystem.resx
diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs
index 0c38544535be3e252b38a694a1eb62eab1621319..485920d7bf6c248f285d9222f1f4327379b20e6a 100644
--- a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class FrmMain
     {
diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs
similarity index 95%
rename from EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs
rename to EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs
index b85544911fc5369b1ec8ef2b2faa4fd3fca390f9..c0f1d0921defcfd6ede1cef5cd4cba7470d8930d 100644
--- a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.cs
+++ b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.cs
@@ -23,15 +23,18 @@
  */
 
 using AntdUI;
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.FormUI.AppUserControls;
-using EOM.TSHotelManager.FormUI.Properties;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.FormUI.AppUserControls;
+using EOM.TSHotelManagement.FormUI.Properties;
 using Sunny.UI;
 using System.Diagnostics;
+using System.Reflection;
+using System.Resources;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class FrmMain : Window
     {
@@ -274,25 +277,24 @@ namespace EOM.TSHotelManager.FormUI
             DateTime tmCur = Convert.ToDateTime(DateTime.Now);
 
             if (tmCur.Hour < 8 || tmCur.Hour > 18)
-            {//晚上
+            {
                 label3.Text = "(*´▽｀)ノノ晚上好 " + LoginInfo.WorkerName;
                 btnHello.BackgroundImage = Resources.月亮;
             }
             else if (tmCur.Hour > 8 && tmCur.Hour < 12)
-            {//上午
+            {
                 label3.Text = "(*´▽｀)ノノ上午好 " + LoginInfo.WorkerName;
                 btnHello.BackgroundImage = Resources.早上;
             }
             else
-            {//下午
+            {
                 label3.Text = "(*´▽｀)ノノ下午好 " + LoginInfo.WorkerName;
                 btnHello.BackgroundImage = Resources.咖啡;
             }
-            //SetClassLong(this.Handle, GCL_STYLE, GetClassLong(this.Handle, GCL_STYLE) | CS_DropSHADOW); //API函数加载，实现窗体边框阴影效果
 
             Dictionary<string, string> user = new Dictionary<string, string>();
             user.Add("wkn", LoginInfo.WorkerNo);
-            result = HttpHelper.Request("WorkerCheck/SelectToDayCheckInfoByWorkerNo", null, user);
+            result = HttpHelper.Request("WorkerCheck/SelectToDayCheckInfoByWorkerNo");
             if (result.statusCode != 200)
             {
                 UIMessageTip.ShowError("打卡接口异常，请提交issue");
@@ -307,11 +309,6 @@ namespace EOM.TSHotelManager.FormUI
             }
             notifyIcon1.Text = "TS酒店管理系统-" + LoginInfo.WorkerName + "-版本号：" + ApplicationUtil.GetApplicationVersion();
             wk_WorkerName = LoginInfo.WorkerName;
-            pnlMID.Controls.Clear();
-            FrmRoomManager frm1 = new FrmRoomManager();
-            frm1.TopLevel = false;
-            pnlMID.Controls.Add(frm1);
-            frm1.Show();
 
             if (_loadingProgress != null)
             {
@@ -405,7 +402,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "wkn", LoginInfo.WorkerNo }
             };
-            result = HttpHelper.Request("WorkerCheck/SelectToDayCheckInfoByWorkerNo", null, user);
+            result = HttpHelper.Request("WorkerCheck/SelectToDayCheckInfoByWorkerNo", user);
             if (result.statusCode != 200)
             {
                 UIMessageTip.ShowError("打卡接口异常，请提交issue");
@@ -418,7 +415,7 @@ namespace EOM.TSHotelManager.FormUI
                 linkLabel1.ForeColor = Color.Green;
                 linkLabel1.LinkColor = Color.Green;
                 pnlCheckInfo.Visible = true;
-                result = HttpHelper.Request("WorkerCheck/SelectWorkerCheckDaySumByWorkerNo", null, user);
+                result = HttpHelper.Request("WorkerCheck/SelectWorkerCheckDaySumByWorkerNo", user);
                 if (result.statusCode != 200)
                 {
                     UIMessageTip.ShowError("打卡接口异常，请提交issue");
@@ -441,7 +438,7 @@ namespace EOM.TSHotelManager.FormUI
                         CheckTime = DateTime.Now,
                         datains_usr = LoginInfo.WorkerNo
                     };
-                    result = HttpHelper.Request("WorkerCheck/AddCheckInfo", workerCheck.ModelToJson(), null);
+                    result = HttpHelper.Request("WorkerCheck/AddCheckInfo", workerCheck.ModelToJson());
                     if (result.statusCode != 200)
                     {
                         UIMessageTip.ShowError("打卡接口异常，请提交issue");
@@ -450,7 +447,7 @@ namespace EOM.TSHotelManager.FormUI
                     bool j = result.statusCode == 200 ? true : false;
                     if (j)
                     {
-                        result = HttpHelper.Request("WorkerCheck/SelectWorkerCheckDaySumByWorkerNo", null, user);
+                        result = HttpHelper.Request("WorkerCheck/SelectWorkerCheckDaySumByWorkerNo", user);
                         if (result.statusCode != 200)
                         {
                             UIMessageTip.ShowError("打卡接口异常，请提交issue");
@@ -520,7 +517,8 @@ namespace EOM.TSHotelManager.FormUI
 
         private void cpUITheme_ValueChanged(object sender, ColorEventArgs e)
         {
-            AntdUI.Style.Db.SetPrimary(e.Value);
+            AntdUI.Style.SetPrimary(e.Value);
+            Settings.Default["ThemeColor"] = e.Value.ToArgb().ToString("X");
             Refresh();
         }
 
diff --git a/EOM.TSHotelManager.FormUI/AppMain/FrmMain.resx b/EOM.TSHotelManagement.FormUI/AppMain/FrmMain.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppMain/FrmMain.resx
rename to EOM.TSHotelManagement.FormUI/AppMain/FrmMain.resx
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.Designer.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucHistory.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucHistory.Designer.cs
index 9111e76e7e3cbbaa25bb0ae80cc94d063a580d16..bd1c728b0749346788d21678715392b3ddad0e87 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucHistory.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class ucHistory
     {
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucHistory.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucHistory.cs
index 345d3c57abda850645e6fc301e4a9cbeb34d31cf..45a42ac2c76a6d390a7d756bb517e467f96a3256 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucHistory.cs
@@ -22,7 +22,7 @@
  *
  */
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class ucHistory : UserControl
     {
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.resx b/EOM.TSHotelManagement.FormUI/AppUserControls/ucHistory.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucHistory.resx
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucHistory.resx
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.Designer.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.Designer.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.Designer.cs
index 589dd728c5be25aea3d4695facbfbac386709b2e..e6eee04a1e5b366f7fc314d756974a1f8bbd4749 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI.AppUserControls
+namespace EOM.TSHotelManagement.FormUI.AppUserControls
 {
     partial class ucNavBar
     {
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.cs
similarity index 95%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.cs
index eb8ffe4b0794592be04af1429a4299530fda6b81..ca8cc1ddf9620fef2ca78e5abdd19ecf34e9182c 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.cs
@@ -21,7 +21,7 @@
  *SOFTWARE.
  *
  */
-namespace EOM.TSHotelManager.FormUI.AppUserControls
+namespace EOM.TSHotelManagement.FormUI.AppUserControls
 {
     public partial class ucNavBar : UserControl
     {
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.resx b/EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucNavBar.resx
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucNavBar.resx
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.Designer.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.Designer.cs
similarity index 99%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.Designer.cs
index f5981aff1334c09912b354d99c9cfac2e81c318e..b56267c860a663cb0ab3a3e4e3b5361a089de8cc 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class ucRoom
     {
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs
similarity index 95%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs
index 2fa95b4a2e0c5be11549871834289e4cc9ae0930..069290971226e786a0f53201f647db93ae756697 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.cs
@@ -1,19 +1,21 @@
-using EOM.TSHotelManager.Common;
-using EOM.TSHotelManager.Common.Core;
-using EOM.TSHotelManager.FormUI.Properties;
+using EOM.TSHotelManagement.Common;
+using EOM.TSHotelManagement.Common.Core;
+using EOM.TSHotelManagement.FormUI.Properties;
 using jvncorelib.EntityLib;
 using Sunny.UI;
 using System.ComponentModel;
 using System.Drawing.Drawing2D;
 using System.Runtime.InteropServices;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class ucRoom : UserControl
     {
+        private LoadingProgress _loadingProgress;
         public ucRoom()
         {
             InitializeComponent();
+            _loadingProgress = new LoadingProgress();
         }
 
 
@@ -205,7 +207,7 @@ namespace EOM.TSHotelManager.FormUI
         private void tsmiReserRoom_Click(object sender, EventArgs e)
         {
             FrmReserManager frm = new FrmReserManager();
-            frm.Show();
+            frm.ShowDialog();
         }
         private void cmsMain_Opening(object sender, CancelEventArgs e)
         {
@@ -224,7 +226,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 { "no", roomText[1] }
             };
-            result = HttpHelper.Request("Room/SelectRoomByRoomNo", string.Empty, getParam);
+            result = HttpHelper.Request("Room/SelectRoomByRoomNo", getParam);
 
             if (result.statusCode != 200)
             {
@@ -293,7 +295,7 @@ namespace EOM.TSHotelManager.FormUI
                     rm_RoomType = romRoomInfo.RoomName;
                     rm_RoomMoney = Convert.ToDecimal(romRoomInfo.RoomMoney).ToString();
                     FrmCheckIn frm = new FrmCheckIn();
-                    frm.Show();
+                    frm.ShowDialog();
                 }
             }
             else
@@ -304,11 +306,12 @@ namespace EOM.TSHotelManager.FormUI
 
         private void tsmiCheckOut_Click(object sender, EventArgs e)
         {
+            _loadingProgress.Show();
             rm_CustoNo = romRoomInfo.CustoNo;
             rm_RoomNo = romRoomInfo.RoomNo;
             rm_RoomType = romRoomInfo.RoomName;
-            FrmCheckOutForm frm = new FrmCheckOutForm();
-            frm.Show();
+            FrmCheckOutForm frm = new FrmCheckOutForm(_loadingProgress);
+            frm.ShowDialog(this);
         }
 
         public static string? RoomNo;
@@ -325,7 +328,7 @@ namespace EOM.TSHotelManager.FormUI
                     CustoNo = romCustoInfo.CustoNo;
                     RoomState = romRoomInfo.RoomState;
                     FrmChangeRoom frm = new FrmChangeRoom();
-                    frm.Show();
+                    frm.ShowDialog();
                 }
             }
             else
@@ -338,7 +341,7 @@ namespace EOM.TSHotelManager.FormUI
         {
             rm_CustoNo = romCustoInfo.CustoNo;
             FrmSelectCustoInfo frm = new FrmSelectCustoInfo();
-            frm.Show();
+            frm.ShowDialog();
         }
 
         private void tsmiChangeState_Click(object sender, EventArgs e)
@@ -352,7 +355,7 @@ namespace EOM.TSHotelManager.FormUI
                     {
                         {"no",r.RoomNo }
                     };
-                    result = HttpHelper.Request("Reser/SelectReserInfoByRoomNo", null, getParam);
+                    result = HttpHelper.Request("Reser/SelectReserInfoByRoomNo", getParam);
                     if (result.statusCode != 200)
                     {
                         UIMessageBox.Show("SelectReserInfoByRoomNo+接口服务异常！", "来自小T提示", UIStyle.Red);
@@ -364,7 +367,7 @@ namespace EOM.TSHotelManager.FormUI
                         {
                             ReserId = HttpHelper.JsonToModel<Reser>(result.message!)!.ReserId
                         };
-                        result = HttpHelper.Request("Reser/DeleteReserInfo", HttpHelper.ModelToJson(reser), null);
+                        result = HttpHelper.Request("Reser/DeleteReserInfo", HttpHelper.ModelToJson(reser));
                         if (result.statusCode != 200)
                         {
                             UIMessageBox.Show("DeleteReserInfo+接口服务异常！", "来自小T提示", UIStyle.Red);
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.resx b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucRoom.resx
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucRoom.resx
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.Designer.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.Designer.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.Designer.cs
index a045bdd9866cdc38161e05251749c643c6693faf..a7679ab7c534753ae6692af3b66d3d111f7681ed 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.Designer.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI.AppUserControls
+namespace EOM.TSHotelManagement.FormUI.AppUserControls
 {
     partial class ucRoomType
     {
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.cs
similarity index 71%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.cs
index 3ce333df94740c89af9c4debb21a635a804ebdf3..45d8a40f35f8cba010f6d43b4272b7a172ea9338 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI.AppUserControls
+namespace EOM.TSHotelManagement.FormUI.AppUserControls
 {
     public partial class ucRoomType : UserControl
     {
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.resx b/EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucRoomType.resx
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucRoomType.resx
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.Designer.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucVipType.Designer.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.Designer.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucVipType.Designer.cs
index 77333420371af1f1284a77dedb1dfff074465a38..5651538ed001e6858d4b69d2ad90aeb436a120e6 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucVipType.Designer.cs
@@ -1,5 +1,5 @@
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     partial class ucVipType
     {
@@ -37,7 +37,7 @@ namespace EOM.TSHotelManager.FormUI
             // picVip
             // 
             this.picVip.BackColor = System.Drawing.Color.Transparent;
-            this.picVip.BackgroundImage = global::EOM.TSHotelManager.FormUI.Properties.Resources.普通会员;
+            this.picVip.BackgroundImage = global::EOM.TSHotelManagement.FormUI.Properties.Resources.普通会员;
             this.picVip.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.picVip.Location = new System.Drawing.Point(0, 0);
             this.picVip.Name = "picVip";
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.cs b/EOM.TSHotelManagement.FormUI/AppUserControls/ucVipType.cs
similarity index 97%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.cs
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucVipType.cs
index 428cc6492c6acf2f4aad7b3a9172619a2c56e4bd..0cad9ce815f46384487d0dc4a8af9ecfaa2dd6c6 100644
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.cs
+++ b/EOM.TSHotelManagement.FormUI/AppUserControls/ucVipType.cs
@@ -21,7 +21,7 @@
  *SOFTWARE.
  *
  */
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public partial class ucVipType : UserControl
     {
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.resx b/EOM.TSHotelManagement.FormUI/AppUserControls/ucVipType.resx
similarity index 100%
rename from EOM.TSHotelManager.FormUI/AppUserControls/ucVipType.resx
rename to EOM.TSHotelManagement.FormUI/AppUserControls/ucVipType.resx
diff --git a/EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj b/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj
similarity index 92%
rename from EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj
rename to EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj
index e617beeae3bd6f0db180d000844f707c80ac23d9..bd8a84776e15ca6c4abadeca794ded49710488ae 100644
--- a/EOM.TSHotelManager.FormUI/EOM.TSHotelManager.FormUI.csproj
+++ b/EOM.TSHotelManagement.FormUI/EOM.TSHotelManagement.FormUI.csproj
@@ -8,7 +8,7 @@
 	  <ImplicitUsings>enable</ImplicitUsings>
 	  <ForceDesignerDPIUnaware>true</ForceDesignerDPIUnaware>
 	  <Version>2.8.1.0</Version>
-	  <StartupObject>EOM.TSHotelManager.FormUI.Program</StartupObject>
+	  <StartupObject>EOM.TSHotelManagement.FormUI.Program</StartupObject>
 	  <PlatformTarget>x64</PlatformTarget>
 	  <AssemblyName>TS酒店管理系统</AssemblyName>
 	  <ApplicationIcon>logo.ico</ApplicationIcon>
@@ -185,25 +185,26 @@
 	<Content Include="bin\Release\*.xml" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\EOM.TSHotelManager.Common\EOM.TSHotelManager.Common.csproj">
+		<ProjectReference Include="..\EOM.TSHotelManagement.Common\EOM.TSHotelManagement.Common.csproj">
 		  <Private>True</Private>
 		  <CopyLocalSatelliteAssemblies>True</CopyLocalSatelliteAssemblies>
 		  <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
 		</ProjectReference>
-		<ProjectReference Include="..\topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Core\EOM.TSHotelManager.Common.Core.csproj">
+		<ProjectReference Include="..\topsky-hotel-management-system-web-api\EOM.TSHotelManagement.Common.Core\EOM.TSHotelManagement.Common.Core.csproj">
 		  <Private>True</Private>
 		  <CopyLocalSatelliteAssemblies>True</CopyLocalSatelliteAssemblies>
 		  <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
 		</ProjectReference>
-		<ProjectReference Include="..\topsky-hotel-manager-system-web-api\EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj">
+		<ProjectReference Include="..\topsky-hotel-management-system-web-api\EOM.TSHotelManagement.Common.Util\EOM.TSHotelManagement.Common.Util.csproj">
 		  <Private>True</Private>
 		  <CopyLocalSatelliteAssemblies>True</CopyLocalSatelliteAssemblies>
 		  <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
 		</ProjectReference>
+		<ProjectReference Include="..\topsky-hotel-management-system-web-api\EOM.TSHotelManagement.Shared\EOM.TSHotelManagement.Shared.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="antdui" Version="1.6.6" />
+		<PackageReference Include="antdui" Version="1.8.4" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 		<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="All" />
 		<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="All" />
@@ -247,7 +248,7 @@
 	</ItemGroup>
 	<ItemGroup>
 	  <None Update="Properties\Settings.settings">
-	    <Generator>SettingsSingleFileGenerator</Generator>
+	    <Generator>PublicSettingsSingleFileGenerator</Generator>
 	    <LastGenOutput>Settings.Designer.cs</LastGenOutput>
 	  </None>
 	</ItemGroup>
diff --git a/EOM.TSHotelManager.FormUI/FodyWeavers.xml b/EOM.TSHotelManagement.FormUI/FodyWeavers.xml
similarity index 100%
rename from EOM.TSHotelManager.FormUI/FodyWeavers.xml
rename to EOM.TSHotelManagement.FormUI/FodyWeavers.xml
diff --git a/EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs b/EOM.TSHotelManagement.FormUI/InitConfig/Initialize.cs
similarity index 96%
rename from EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs
rename to EOM.TSHotelManagement.FormUI/InitConfig/Initialize.cs
index eff58be59aeff3713a17ac01ba311da1844379c9..1edd0a11bd66c787a9e7db8edbd395d44ac74fae 100644
--- a/EOM.TSHotelManager.FormUI/InitConfig/Initialize.cs
+++ b/EOM.TSHotelManagement.FormUI/InitConfig/Initialize.cs
@@ -1,7 +1,7 @@
-using EOM.TSHotelManager.Common;
+using EOM.TSHotelManagement.Common;
 using System.Reflection;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public static class Initialize
     {
diff --git a/EOM.TSHotelManager.FormUI/Logo/bitbug_favicon (1).ico b/EOM.TSHotelManagement.FormUI/Logo/bitbug_favicon (1).ico
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Logo/bitbug_favicon (1).ico
rename to EOM.TSHotelManagement.FormUI/Logo/bitbug_favicon (1).ico
diff --git a/EOM.TSHotelManager.FormUI/Program.cs b/EOM.TSHotelManagement.FormUI/Program.cs
similarity index 93%
rename from EOM.TSHotelManager.FormUI/Program.cs
rename to EOM.TSHotelManagement.FormUI/Program.cs
index 5f8c6d38176d52e62d537869f1461cf2c92fb3b8..25280b03b64ee8072b3f1abd9f4858e7b08429c2 100644
--- a/EOM.TSHotelManager.FormUI/Program.cs
+++ b/EOM.TSHotelManagement.FormUI/Program.cs
@@ -1,4 +1,4 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     internal static class Program
     {
diff --git a/EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs b/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs
similarity index 95%
rename from EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs
rename to EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs
index d06748f783f4a845ebbfa14fd8b67c4ca1c1b8dc..7ea610ec3933cadacbba48ab5965b5a56e187767 100644
--- a/EOM.TSHotelManager.FormUI/Properties/Resources.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace EOM.TSHotelManager.FormUI.Properties {
+namespace EOM.TSHotelManagement.FormUI.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace EOM.TSHotelManager.FormUI.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("EOM.TSHotelManager.FormUI.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("EOM.TSHotelManagement.FormUI.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -101,27 +101,12 @@ namespace EOM.TSHotelManager.FormUI.Properties {
         }
         
         /// <summary>
-        ///   查找类似 &lt;?xml version=&quot;1.0&quot;?&gt;
-        ///&lt;doc&gt;
-        ///    &lt;assembly&gt;
-        ///        &lt;name&gt;EOM.TSHotelManager.Common.Core&lt;/name&gt;
-        ///    &lt;/assembly&gt;
-        ///    &lt;members&gt;
-        ///        &lt;member name=&quot;P:EOM.TSHotelManager.Common.Core.BaseDTO.datains_usr&quot;&gt;
-        ///            &lt;summary&gt;
-        ///            资料创建人
-        ///            &lt;/summary&gt;
-        ///        &lt;/member&gt;
-        ///        &lt;member name=&quot;P:EOM.TSHotelManager.Common.Core.BaseDTO.datains_date&quot;&gt;
-        ///            &lt;summary&gt;
-        ///            资料创建时间
-        ///            &lt;/summary&gt;
-        ///        &lt;/member&gt;
-        ///        &lt;member name=&quot;P:EOM.TSHotelManager.Common.Cor [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
-        internal static string EOM_TSHotelManager_Common_Core {
+        internal static byte[] EOM_TSHotelManagement_Common_Core {
             get {
-                return ResourceManager.GetString("EOM.TSHotelManager.Common.Core", resourceCulture);
+                object obj = ResourceManager.GetObject("EOM.TSHotelManagement.Common.Core", resourceCulture);
+                return ((byte[])(obj));
             }
         }
         
@@ -235,6 +220,16 @@ namespace EOM.TSHotelManager.FormUI.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] TableColumns {
+            get {
+                object obj = ResourceManager.GetObject("TableColumns", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
diff --git a/EOM.TSHotelManager.FormUI/Properties/Resources.resx b/EOM.TSHotelManagement.FormUI/Properties/Resources.resx
similarity index 97%
rename from EOM.TSHotelManager.FormUI/Properties/Resources.resx
rename to EOM.TSHotelManagement.FormUI/Properties/Resources.resx
index f67e9c34ddbf046f3d804ab3f01973164df1949f..ff6a31f956c5266f5bba5cbb2892cf424a8ee3b7 100644
--- a/EOM.TSHotelManager.FormUI/Properties/Resources.resx
+++ b/EOM.TSHotelManagement.FormUI/Properties/Resources.resx
@@ -127,6 +127,9 @@
   <data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="EOM.TSHotelManagement.Common.Core" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\EOM.TSHotelManagement.Common.Core.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -163,6 +166,9 @@
   <data name="settings2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\settings2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TableColumns" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\EOM.TSHotelManagement.Common.Core.xml;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="上传照片" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\上传照片.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -310,7 +316,4 @@
   <data name="黄金会员" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\黄金会员.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="EOM.TSHotelManager.Common.Core" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\EOM.TSHotelManager.Common.Core.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/Properties/Settings.Designer.cs b/EOM.TSHotelManagement.FormUI/Properties/Settings.Designer.cs
similarity index 84%
rename from EOM.TSHotelManager.FormUI/Properties/Settings.Designer.cs
rename to EOM.TSHotelManagement.FormUI/Properties/Settings.Designer.cs
index 25b386f273989e98d61b4dfe22e14272db72a894..4abd93d7240756ddf4304fb932c792fa50f4f10d 100644
--- a/EOM.TSHotelManager.FormUI/Properties/Settings.Designer.cs
+++ b/EOM.TSHotelManagement.FormUI/Properties/Settings.Designer.cs
@@ -8,12 +8,12 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace EOM.TSHotelManager.FormUI.Properties {
+namespace EOM.TSHotelManagement.FormUI.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")]
+    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         
diff --git a/EOM.TSHotelManager.FormUI/Properties/Settings.settings b/EOM.TSHotelManagement.FormUI/Properties/Settings.settings
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Properties/Settings.settings
rename to EOM.TSHotelManagement.FormUI/Properties/Settings.settings
diff --git a/EOM.TSHotelManager.FormUI/Resources/EOM.TSHotelManager.Common.Core.xml b/EOM.TSHotelManagement.FormUI/Resources/EOM.TSHotelManagement.Common.Core.xml
similarity index 51%
rename from EOM.TSHotelManager.FormUI/Resources/EOM.TSHotelManager.Common.Core.xml
rename to EOM.TSHotelManagement.FormUI/Resources/EOM.TSHotelManagement.Common.Core.xml
index dfbb6e9e223624dcb01ac6a287342539f009ea0e..2dcd4f7798d21f255a478a415d888c4bd8160e2e 100644
--- a/EOM.TSHotelManager.FormUI/Resources/EOM.TSHotelManager.Common.Core.xml
+++ b/EOM.TSHotelManagement.FormUI/Resources/EOM.TSHotelManagement.Common.Core.xml
@@ -1,1501 +1,1552 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>EOM.TSHotelManager.Common.Core</name>
+        <name>EOM.TSHotelManagement.Common.Core</name>
     </assembly>
     <members>
-        <member name="P:EOM.TSHotelManager.Common.Core.BaseDTO.datains_usr">
+        <member name="P:EOM.TSHotelManagement.Common.Core.BaseDTO.datains_usr">
             <summary>
             资料创建人
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.BaseDTO.datains_date">
+        <member name="P:EOM.TSHotelManagement.Common.Core.BaseDTO.datains_date">
             <summary>
             资料创建时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.BaseDTO.datachg_usr">
+        <member name="P:EOM.TSHotelManagement.Common.Core.BaseDTO.datachg_usr">
             <summary>
             资料更新人
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.BaseDTO.datachg_date">
+        <member name="P:EOM.TSHotelManagement.Common.Core.BaseDTO.datachg_date">
             <summary>
             资料更新时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.BaseDTO.user_token">
+        <member name="P:EOM.TSHotelManagement.Common.Core.BaseDTO.user_token">
             <summary>
             Token
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Cash">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Cash">
             <summary>
             资产管理
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.CashNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.CashNo">
             <summary>
             资产编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.CashName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.CashName">
             <summary>
             资产名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.CashPrice">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.CashPrice">
             <summary>
             资产总值
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.CashPriceStr">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.CashPriceStr">
             <summary>
             资产总值描述
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.CashClub">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.CashClub">
             <summary>
             所属部门
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.DeptName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.DeptName">
             <summary>
             所属部门描述
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.CashTime">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.CashTime">
             <summary>
             入库时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.CashSource">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.CashSource">
             <summary>
             资产来源
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.CashPerson">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.CashPerson">
             <summary>
             资产经办人
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.PersonName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.PersonName">
             <summary>
             资产经办人
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cash.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cash.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Custo">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Custo">
             <summary>
             客户信息
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.CustoNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.CustoNo">
             <summary>
             客户编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.CustoName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.CustoName">
             <summary>
             客户名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.CustoSex">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.CustoSex">
             <summary>
             客户性别
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.PassportType">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.PassportType">
             <summary>
             证件类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.SexName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.SexName">
             <summary>
             性别
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.CustoTel">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.CustoTel">
             <summary>
             客户电话
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.CustoBirth">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.CustoBirth">
             <summary>
             出生日期
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.typeName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.typeName">
             <summary>
             客户类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.PassportName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.PassportName">
             <summary>
             证件类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.CustoID">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.CustoID">
             <summary>
             证件号码
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.CustoAdress">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.CustoAdress">
             <summary>
             居住地址
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.CustoType">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.CustoType">
             <summary>
             客户类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Custo.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Custo.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.CustoSpend">
+        <member name="T:EOM.TSHotelManagement.Common.Core.CustoSpend">
             <summary>
             酒店盈利情况
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CustoSpend.Years">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CustoSpend.Years">
             <summary>
             年
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CustoSpend.Money">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CustoSpend.Money">
             <summary>
             总金额
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.CustoType">
+        <member name="T:EOM.TSHotelManagement.Common.Core.CustoType">
             <summary>
             客户类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CustoType.UserType">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CustoType.UserType">
             <summary>
             客户类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CustoType.TypeName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CustoType.TypeName">
             <summary>
             类型名字
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CustoType.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CustoType.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.PassPortType">
+        <member name="T:EOM.TSHotelManagement.Common.Core.PassPortType">
             <summary>
             证件类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.PassPortType.PassportId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.PassPortType.PassportId">
             <summary>
             证件类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.PassPortType.PassportName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.PassPortType.PassportName">
             <summary>
             证件名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.PassPortType.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.PassPortType.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.SexType">
+        <member name="T:EOM.TSHotelManagement.Common.Core.SexType">
             <summary>
             性别
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SexType.sexId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SexType.sexId">
             <summary>
             性别ID
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SexType.sexName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SexType.sexName">
             <summary>
             性别名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SexType.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SexType.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Fonts">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Fonts">
             <summary>
             酒店宣传联动内容
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Fonts.FontsId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Fonts.FontsId">
             <summary>
             宣传内容编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Fonts.FontsMess">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Fonts.FontsMess">
             <summary>
             宣传内容
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.HydroelectricPower">
+        <member name="T:EOM.TSHotelManagement.Common.Core.HydroelectricPower">
             <summary>
             水电信息
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.HydroelectricPower.WtiNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.HydroelectricPower.WtiNo">
             <summary>
             信息编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.HydroelectricPower.RoomNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.HydroelectricPower.RoomNo">
             <summary>
             房间编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.HydroelectricPower.UseDate">
+        <member name="P:EOM.TSHotelManagement.Common.Core.HydroelectricPower.UseDate">
             <summary>
             开始使用时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.HydroelectricPower.EndDate">
+        <member name="P:EOM.TSHotelManagement.Common.Core.HydroelectricPower.EndDate">
             <summary>
             结束使用时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.HydroelectricPower.WaterUse">
+        <member name="P:EOM.TSHotelManagement.Common.Core.HydroelectricPower.WaterUse">
             <summary>
             水费
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.HydroelectricPower.PowerUse">
+        <member name="P:EOM.TSHotelManagement.Common.Core.HydroelectricPower.PowerUse">
             <summary>
             电费
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.HydroelectricPower.Record">
+        <member name="P:EOM.TSHotelManagement.Common.Core.HydroelectricPower.Record">
             <summary>
             记录员
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.HydroelectricPower.CustoNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.HydroelectricPower.CustoNo">
             <summary>
             客户编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.HydroelectricPower.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.HydroelectricPower.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Reser">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Reser">
             <summary>
             预约列表
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Reser.ReserId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Reser.ReserId">
             <summary>
             预约编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Reser.CustoName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Reser.CustoName">
             <summary>
             客户名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Reser.CustoTel">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Reser.CustoTel">
             <summary>
             预约电话
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Reser.ReserWay">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Reser.ReserWay">
             <summary>
             预约渠道
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Reser.ReserRoom">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Reser.ReserRoom">
             <summary>
             预约房号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Reser.ReserDate">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Reser.ReserDate">
             <summary>
             预约起始
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Reser.ReserEndDay">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Reser.ReserEndDay">
             <summary>
             预约止日
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Reser.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Reser.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Room">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Room">
             <summary>
             房间实体类
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.RoomNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.RoomNo">
             <summary>
             房间编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.RoomType">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.RoomType">
             <summary>
             房间类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.CustoNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.CustoNo">
             <summary>
             客户编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.CustoName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.CustoName">
             <summary>
             客户姓名
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.CheckTime">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.CheckTime">
             <summary>
             最后一次入住时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.CheckOutTime">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.CheckOutTime">
             <summary>
             最后一次退房时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.RoomStateId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.RoomStateId">
             <summary>
             房间状态ID
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.RoomState">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.RoomState">
             <summary>
             房间状态
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.RoomMoney">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.RoomMoney">
             <summary>
             房间单价
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.RoomDeposit">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.RoomDeposit">
             <summary>
             房间押金
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.RoomPosition">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.RoomPosition">
             <summary>
             房间位置
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.typeName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.typeName">
             <summary>
             客户类型名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.RoomName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.RoomName">
             <summary>
             房间名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.CheckTimeFormat">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.CheckTimeFormat">
             <summary>
             最后一次入住时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Room.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Room.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.RoomState">
+        <member name="T:EOM.TSHotelManagement.Common.Core.RoomState">
             <summary>
             房间状态
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.RoomState.RoomStateId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.RoomState.RoomStateId">
             <summary>
             房间状态编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.RoomState.RoomStateName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.RoomState.RoomStateName">
             <summary>
             房间状态
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.RoomState.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.RoomState.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.RoomType">
+        <member name="T:EOM.TSHotelManagement.Common.Core.RoomType">
             <summary>
             房间类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.RoomType.Roomtype">
+        <member name="P:EOM.TSHotelManagement.Common.Core.RoomType.Roomtype">
             <summary>
             类型编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.RoomType.RoomName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.RoomType.RoomName">
             <summary>
             房间类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.RoomType.RoomRent">
+        <member name="P:EOM.TSHotelManagement.Common.Core.RoomType.RoomRent">
             <summary>
             房间租金
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.RoomType.RoomDeposit">
+        <member name="P:EOM.TSHotelManagement.Common.Core.RoomType.RoomDeposit">
             <summary>
             房间押金
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.RoomType.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.RoomType.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.RoomType.DeleteMkNm">
+        <member name="P:EOM.TSHotelManagement.Common.Core.RoomType.DeleteMkNm">
             <summary>
             删除标记描述
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.SellThing">
+        <member name="T:EOM.TSHotelManagement.Common.Core.SellThing">
             <summary>
             商品信息
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SellThing.SellNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SellThing.SellNo">
             <summary>
             商品编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SellThing.SellName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SellThing.SellName">
             <summary>
             商品名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SellThing.SellPrice">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SellThing.SellPrice">
             <summary>
             商品价格
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SellThing.SellPriceStr">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SellThing.SellPriceStr">
             <summary>
             商品价格描述
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SellThing.format">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SellThing.format">
             <summary>
             规格型号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SellThing.Stock">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SellThing.Stock">
             <summary>
             库存
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.SellThing.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.SellThing.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Spend">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Spend">
             <summary>
             消费信息
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.RoomNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.RoomNo">
             <summary>
             房间编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.CustoNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.CustoNo">
             <summary>
             客户编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.SpendName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.SpendName">
             <summary>
             商品名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.SpendAmount">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.SpendAmount">
             <summary>
             消费数量
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.SpendPrice">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.SpendPrice">
             <summary>
             商品单价
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.SpendPriceStr">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.SpendPriceStr">
             <summary>
             商品单价描述
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.SpendMoney">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.SpendMoney">
             <summary>
             消费金额
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.SpendMoneyStr">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.SpendMoneyStr">
             <summary>
             消费金额描述
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.SpendTime">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.SpendTime">
             <summary>
             消费时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.MoneyState">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.MoneyState">
             <summary>
             结算状态
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Spend.SpendStateNm">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Spend.SpendStateNm">
             <summary>
             结算状态描述
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.SpendConsts">
-            <summary>
-            结算状态常量
-            </summary>
-        </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.SpendConsts.Settled">
-            <summary>
-            已结算状态常量
-            </summary>
-        </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.SpendConsts.UnSettle">
-            <summary>
-            未结算状态常量
-            </summary>
-        </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.OSelectAllDto`1">
+        <member name="T:EOM.TSHotelManagement.Common.Core.OSelectAllDto`1">
             <summary>
             查询所有客户信息
             输出DTO
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OSelectAllDto`1.listSource">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OSelectAllDto`1.listSource">
             <summary>
             数据源
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OSelectAllDto`1.total">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OSelectAllDto`1.total">
             <summary>
             总数
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.NavBar">
+        <member name="T:EOM.TSHotelManagement.Common.Core.NavBar">
             <summary>
             导航控件实体类
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.NavBar.nav_id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.NavBar.nav_id">
             <summary>
             导航控件ID
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.NavBar.nav_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.NavBar.nav_name">
             <summary>
             导航控件名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.NavBar.nav_or">
+        <member name="P:EOM.TSHotelManagement.Common.Core.NavBar.nav_or">
             <summary>
             导航控件排序
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.NavBar.nav_pic">
+        <member name="P:EOM.TSHotelManagement.Common.Core.NavBar.nav_pic">
             <summary>
             导航控件图片
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.NavBar.nav_event">
+        <member name="P:EOM.TSHotelManagement.Common.Core.NavBar.nav_event">
             <summary>
             导航控件事件
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.NavBar.margin_left">
+        <member name="P:EOM.TSHotelManagement.Common.Core.NavBar.margin_left">
             <summary>
             导航控件事件
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.NavBar.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.NavBar.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Applicationversion">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Applicationversion">
             <summary>
             应用版本
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Applicationversion.base_versionId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Applicationversion.base_versionId">
             <summary>
             流水号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Applicationversion.base_version">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Applicationversion.base_version">
             <summary>
             版本号
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Cardcodes">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Cardcodes">
             <summary>
             卡片代码
             </summary>
         </member>
-        <member name="M:EOM.TSHotelManager.Common.Core.Cardcodes.#ctor">
+        <member name="M:EOM.TSHotelManagement.Common.Core.Cardcodes.#ctor">
             <summary>
             卡片代码
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cardcodes.id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cardcodes.id">
             <summary>
             编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cardcodes.Province">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cardcodes.Province">
             <summary>
             省份
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cardcodes.City">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cardcodes.City">
             <summary>
             城市
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cardcodes.District">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cardcodes.District">
             <summary>
             地区
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Cardcodes.bm">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Cardcodes.bm">
             <summary>
             地区识别码
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.RecordLevel">
+        <member name="T:EOM.TSHotelManagement.Common.Core.RecordLevel">
             <summary>
             日志等级
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.RecordLevel.Normal">
+        <member name="F:EOM.TSHotelManagement.Common.Core.RecordLevel.Normal">
             <summary>
             普通警告
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.RecordLevel.Warning">
+        <member name="F:EOM.TSHotelManagement.Common.Core.RecordLevel.Warning">
             <summary>
             严重警告
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.RecordLevel.Danger">
+        <member name="F:EOM.TSHotelManagement.Common.Core.RecordLevel.Danger">
             <summary>
             危险警告
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.OperationLog">
+        <member name="T:EOM.TSHotelManagement.Common.Core.OperationLog">
             <summary>
             操作日志
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OperationLog.OperationId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OperationLog.OperationId">
             <summary>
             日志ID
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OperationLog.OperationTime">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OperationLog.OperationTime">
             <summary>
             操作时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OperationLog.LogContent">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OperationLog.LogContent">
             <summary>
             操作信息
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OperationLog.OperationAccount">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OperationLog.OperationAccount">
             <summary>
             操作账号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OperationLog.OperationLevel">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OperationLog.OperationLevel">
             <summary>
             日志等级
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OperationLog.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OperationLog.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OperationLog.SoftwareVersion">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OperationLog.SoftwareVersion">
             <summary>
             软件版本
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OperationLog.login_ip">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OperationLog.login_ip">
             <summary>
             登录IP
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.OperationLog.OperationLevelNm">
+        <member name="P:EOM.TSHotelManagement.Common.Core.OperationLog.OperationLevelNm">
             <summary>
             日志等级
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.GBType">
+        <member name="T:EOM.TSHotelManagement.Common.Core.GBType">
             <summary>
             奖惩类型实体类
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.GBType.GBTypeId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.GBType.GBTypeId">
             <summary>
             奖惩编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.GBType.GBName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.GBType.GBName">
             <summary>
             奖惩名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.GBType.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.GBType.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Worker">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Worker">
             <summary>
             员工信息
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerId">
             <summary>
             员工账号/工号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerName">
             <summary>
             员工姓名
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerBirthday">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerBirthday">
             <summary>
             出生日期
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerSex">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerSex">
             <summary>
             员工性别
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerSexName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerSexName">
             <summary>
             员工性别(名称描述)
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerNation">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerNation">
             <summary>
             民族类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.NationName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.NationName">
             <summary>
             民族名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerTel">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerTel">
             <summary>
             员工电话
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerClub">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerClub">
             <summary>
             所属部门
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.ClubName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.ClubName">
             <summary>
             部门名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerAddress">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerAddress">
             <summary>
             居住地址
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerPosition">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerPosition">
             <summary>
             员工职位
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.PositionName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.PositionName">
             <summary>
             职位名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.CardId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.CardId">
             <summary>
             证件号码
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerPwd">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerPwd">
             <summary>
             员工密码
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerTime">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerTime">
             <summary>
             员工入职时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerFace">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerFace">
             <summary>
             员工面貌
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.FaceName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.FaceName">
             <summary>
             群众面貌描述
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.WorkerEducation">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.WorkerEducation">
             <summary>
             教育程度
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.EducationName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.EducationName">
             <summary>
             教育程度名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Worker.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Worker.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.WorkerCheck">
+        <member name="T:EOM.TSHotelManagement.Common.Core.WorkerCheck">
             <summary>
             员工打卡考勤
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerCheck.Id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerCheck.Id">
             <summary>
             编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerCheck.WorkerNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerCheck.WorkerNo">
             <summary>
             工号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerCheck.CheckTime">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerCheck.CheckTime">
             <summary>
             打卡时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerCheck.CheckWay">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerCheck.CheckWay">
             <summary>
             打卡方式
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerCheck.CheckState">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerCheck.CheckState">
             <summary>
             打卡状态
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerCheck.CheckStateNm">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerCheck.CheckStateNm">
             <summary>
             打卡状态
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerCheck.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerCheck.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.WorkerGoodBad">
+        <member name="T:EOM.TSHotelManagement.Common.Core.WorkerGoodBad">
             <summary>
             员工奖罚
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerGoodBad.Id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerGoodBad.Id">
             <summary>
             编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerGoodBad.WorkNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerGoodBad.WorkNo">
             <summary>
             工号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerGoodBad.GBInfo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerGoodBad.GBInfo">
             <summary>
             奖惩信息
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerGoodBad.GBType">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerGoodBad.GBType">
             <summary>
             奖惩类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerGoodBad.GBOperation">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerGoodBad.GBOperation">
             <summary>
             奖惩操作人
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerGoodBad.OperationName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerGoodBad.OperationName">
             <summary>
             奖惩操作人
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerGoodBad.GBTime">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerGoodBad.GBTime">
             <summary>
             奖惩时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerGoodBad.TypeName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerGoodBad.TypeName">
             <summary>
             类型名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerGoodBad.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerGoodBad.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.WorkerHistory">
+        <member name="T:EOM.TSHotelManagement.Common.Core.WorkerHistory">
             <summary>
             员工履历
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerHistory.Id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerHistory.Id">
             <summary>
             编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerHistory.WorkerId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerHistory.WorkerId">
             <summary>
             工号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerHistory.StartDate">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerHistory.StartDate">
             <summary>
             开始时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerHistory.EndDate">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerHistory.EndDate">
             <summary>
             结束时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerHistory.Position">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerHistory.Position">
             <summary>
             职位
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerHistory.Company">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerHistory.Company">
             <summary>
             公司
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerHistory.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerHistory.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.WorkerPic">
+        <member name="T:EOM.TSHotelManagement.Common.Core.WorkerPic">
             <summary>
             员工照片
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerPic.Id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerPic.Id">
             <summary>
             自增长流水号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerPic.WorkerId">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerPic.WorkerId">
             <summary>
             工号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.WorkerPic.Pic">
+        <member name="P:EOM.TSHotelManagement.Common.Core.WorkerPic.Pic">
             <summary>
             照片路径
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Admin">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Admin">
             <summary>
             管理员实体类
             </summary>
         </member>
-        <member name="M:EOM.TSHotelManager.Common.Core.Admin.#ctor">
+        <member name="M:EOM.TSHotelManagement.Common.Core.Admin.#ctor">
             <summary>
             构造函数
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.Id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.Id">
             <summary>
             编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.AdminAccount">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.AdminAccount">
             <summary>
             管理员账号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.AdminPassword">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.AdminPassword">
             <summary>
             管理员密码
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.AdminType">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.AdminType">
             <summary>
             管理员类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.AdminName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.AdminName">
             <summary>
             管理员名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.IsAdmin">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.IsAdmin">
             <summary>
             是否为超级管理员
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.DeleteMk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.DeleteMk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.IsAdminNm">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.IsAdminNm">
             <summary>
             管理员类型描述
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.TypeName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.TypeName">
             <summary>
             管理员类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Admin.DeleteNm">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Admin.DeleteNm">
             <summary>
             删除标记描述
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.AdminType">
+        <member name="T:EOM.TSHotelManagement.Common.Core.AdminType">
             <summary>
             管理员类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.AdminType.Id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.AdminType.Id">
             <summary>
             编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.AdminType.type_id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.AdminType.type_id">
             <summary>
             管理员类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.AdminType.type_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.AdminType.type_name">
             <summary>
             类型名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.AdminType.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.AdminType.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Base">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Base">
             <summary>
             系统信息
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Base.url_no">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Base.url_no">
             <summary>
             地址编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Base.url_addr">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Base.url_addr">
             <summary>
             地址
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.CheckInfo">
+        <member name="T:EOM.TSHotelManagement.Common.Core.CheckInfo">
             <summary>
             监管统计
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CheckInfo.CheckNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CheckInfo.CheckNo">
             <summary>
             监管统计编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CheckInfo.CheckClub">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CheckInfo.CheckClub">
             <summary>
             监管部门
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CheckInfo.CheckProgres">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CheckInfo.CheckProgres">
             <summary>
             监管进度
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CheckInfo.CheckCash">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CheckInfo.CheckCash">
             <summary>
             
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CheckInfo.CheckScore">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CheckInfo.CheckScore">
             <summary>
             
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CheckInfo.CheckPerson">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CheckInfo.CheckPerson">
             <summary>
             
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CheckInfo.CheckAdvice">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CheckInfo.CheckAdvice">
             <summary>
             
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.CheckInfo.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.CheckInfo.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Dept">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Dept">
             <summary>
             部门表
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Dept.dept_no">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Dept.dept_no">
             <summary>
             部门编号
             </summary>  
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Dept.dept_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Dept.dept_name">
             <summary>
             部门名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Dept.dept_desc">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Dept.dept_desc">
             <summary>
             部门描述
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Dept.dept_date">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Dept.dept_date">
             <summary>
             创建时间(部门)
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Dept.dept_leader">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Dept.dept_leader">
             <summary>
             部门主管
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Dept.leader_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Dept.leader_name">
             <summary>
             部门主管
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Dept.dept_parent">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Dept.dept_parent">
             <summary>
             上级部门
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Dept.parent_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Dept.parent_name">
             <summary>
             上级部门
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Dept.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Dept.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Education">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Education">
             <summary>
             学历
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Education.education_no">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Education.education_no">
             <summary>
             学历编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Education.education_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Education.education_name">
             <summary>
             学历名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Education.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Education.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Module">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Menu">
+             <summary>
+             菜单表
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.Menu.Id">
+             <summary>
+             备  注:自增长ID
+             默认值:
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.Menu.Key">
+             <summary>
+             备  注:菜单键
+             默认值:
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.Menu.Title">
+             <summary>
+             备  注:菜单标题
+             默认值:
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.Menu.Path">
+             <summary>
+             备  注:菜单路径
+             默认值:
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.Menu.Parent">
+             <summary>
+             备  注:父级ID
+             默认值:
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.Menu.DeleteMk">
+             <summary>
+             备  注:删除标记
+             默认值:
+            </summary>
+        </member>
+        <member name="T:EOM.TSHotelManagement.Common.Core.MenuViewModel">
+            <summary>
+            菜单视图模型
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.MenuViewModel.key">
+            <summary>
+            菜单主键
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.MenuViewModel.title">
+            <summary>
+            菜单标题
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.MenuViewModel.path">
+            <summary>
+            菜单路径
+            </summary>
+        </member>
+        <member name="P:EOM.TSHotelManagement.Common.Core.MenuViewModel.children">
+            <summary>
+            子菜单
+            </summary>
+        </member>
+        <member name="T:EOM.TSHotelManagement.Common.Core.Module">
             <summary>
             模块实体
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Module.module_id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Module.module_id">
             <summary>
             模块ID
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Module.module_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Module.module_name">
             <summary>
             模块名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Module.module_desc">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Module.module_desc">
             <summary>
             模块描述
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Module.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Module.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.ModuleConsts">
+        <member name="T:EOM.TSHotelManagement.Common.Core.ModuleConsts">
             <summary>
             系统模块常量类
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.BaseInfo">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.BaseInfo">
             <summary>
             基础信息
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.CashInfo">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.CashInfo">
             <summary>
             财务信息
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.WtiInfo">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.WtiInfo">
             <summary>
             水电管理
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.CheckInfo">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.CheckInfo">
             <summary>
             监管统计
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.RoomManager">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.RoomManager">
             <summary>
             客房管理
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.CustomerManager">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.CustomerManager">
             <summary>
             客户管理
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.HumanResourcesManager">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.HumanResourcesManager">
             <summary>
             人事管理
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.MaterialManager">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.MaterialManager">
             <summary>
             物资管理
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.OperationLogManager">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.OperationLogManager">
             <summary>
             员工操作日志
             </summary>
         </member>
-        <member name="F:EOM.TSHotelManager.Common.Core.ModuleConsts.AdminManager">
+        <member name="F:EOM.TSHotelManagement.Common.Core.ModuleConsts.AdminManager">
             <summary>
             系统管理
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.ModuleZero">
+        <member name="T:EOM.TSHotelManagement.Common.Core.ModuleZero">
             <summary>
             模块权限表
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.ModuleZero.module_id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.ModuleZero.module_id">
             <summary>
             模块ID
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.ModuleZero.admin_account">
+        <member name="P:EOM.TSHotelManagement.Common.Core.ModuleZero.admin_account">
             <summary>
             管理员账号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.ModuleZero.module_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.ModuleZero.module_name">
             <summary>
             模块名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.ModuleZero.module_enable">
+        <member name="P:EOM.TSHotelManagement.Common.Core.ModuleZero.module_enable">
             <summary>
             是否开启
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Nation">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Nation">
             <summary>
             民族
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Nation.nation_no">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Nation.nation_no">
             <summary>
             民族编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Nation.nation_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Nation.nation_name">
             <summary>
             民族名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Nation.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Nation.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Notice">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Notice">
             <summary>
             任命公告
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Notice.NoticeNo">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Notice.NoticeNo">
             <summary>
             公告编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Notice.Noticetheme">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Notice.Noticetheme">
             <summary>
             公告主题
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Notice.NoticeType">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Notice.NoticeType">
             <summary>
             公告类型
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Notice.NoticeTypeName">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Notice.NoticeTypeName">
             <summary>
             公告类型(描述)
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Notice.NoticeTime">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Notice.NoticeTime">
             <summary>
             公告时间
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Notice.NoticeContent">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Notice.NoticeContent">
             <summary>
             公告正文
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Notice.NoticeClub">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Notice.NoticeClub">
             <summary>
             发文部门
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Notice.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Notice.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.Position">
+        <member name="T:EOM.TSHotelManagement.Common.Core.Position">
             <summary>
             职位
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Position.position_no">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Position.position_no">
             <summary>
             职位编号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Position.position_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Position.position_name">
             <summary>
             职位名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.Position.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.Position.delete_mk">
             <summary>
             删除标记
             </summary>
         </member>
-        <member name="T:EOM.TSHotelManager.Common.Core.VipRule">
+        <member name="T:EOM.TSHotelManagement.Common.Core.VipRule">
             <summary>
             会员等级规则类
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.VipRule.id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.VipRule.id">
             <summary>
             索引ID
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.VipRule.rule_id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.VipRule.rule_id">
             <summary>
             会员规则流水号
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.VipRule.rule_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.VipRule.rule_name">
             <summary>
             会员规则名称
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.VipRule.rule_value">
+        <member name="P:EOM.TSHotelManagement.Common.Core.VipRule.rule_value">
             <summary>
             预设数值(历史消费总额)
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.VipRule.type_id">
+        <member name="P:EOM.TSHotelManagement.Common.Core.VipRule.type_id">
             <summary>
             会员等级
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.VipRule.delete_mk">
+        <member name="P:EOM.TSHotelManagement.Common.Core.VipRule.delete_mk">
             <summary>
             删除标识
             </summary>
         </member>
-        <member name="P:EOM.TSHotelManager.Common.Core.VipRule.type_name">
+        <member name="P:EOM.TSHotelManagement.Common.Core.VipRule.type_name">
             <summary>
             会员等级描述
             </summary>
diff --git a/EOM.TSHotelManager.FormUI/Resources/arrow-down-b.png b/EOM.TSHotelManagement.FormUI/Resources/arrow-down-b.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/arrow-down-b.png
rename to EOM.TSHotelManagement.FormUI/Resources/arrow-down-b.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/blue_refresh.png b/EOM.TSHotelManagement.FormUI/Resources/blue_refresh.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/blue_refresh.png
rename to EOM.TSHotelManagement.FormUI/Resources/blue_refresh.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/close.png b/EOM.TSHotelManagement.FormUI/Resources/close.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/close.png
rename to EOM.TSHotelManagement.FormUI/Resources/close.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png b/EOM.TSHotelManagement.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png
rename to EOM.TSHotelManagement.FormUI/Resources/jpg_auto_04N58PICPw2s58PICaP4M8cef_PIC2018.jpg!w1024_new_small.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/lockicon.png b/EOM.TSHotelManagement.FormUI/Resources/lockicon.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/lockicon.png
rename to EOM.TSHotelManagement.FormUI/Resources/lockicon.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/picCommodity.Image.png b/EOM.TSHotelManagement.FormUI/Resources/picCommodity.Image.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/picCommodity.Image.png
rename to EOM.TSHotelManagement.FormUI/Resources/picCommodity.Image.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/picCommodity.ImageHover.png b/EOM.TSHotelManagement.FormUI/Resources/picCommodity.ImageHover.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/picCommodity.ImageHover.png
rename to EOM.TSHotelManagement.FormUI/Resources/picCommodity.ImageHover.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/picCustomer.Image.png b/EOM.TSHotelManagement.FormUI/Resources/picCustomer.Image.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/picCustomer.Image.png
rename to EOM.TSHotelManagement.FormUI/Resources/picCustomer.Image.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/picCustomer.ImageHover.png b/EOM.TSHotelManagement.FormUI/Resources/picCustomer.ImageHover.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/picCustomer.ImageHover.png
rename to EOM.TSHotelManagement.FormUI/Resources/picCustomer.ImageHover.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/picExtend.Image.png b/EOM.TSHotelManagement.FormUI/Resources/picExtend.Image.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/picExtend.Image.png
rename to EOM.TSHotelManagement.FormUI/Resources/picExtend.Image.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/picExtend.ImageHover.png b/EOM.TSHotelManagement.FormUI/Resources/picExtend.ImageHover.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/picExtend.ImageHover.png
rename to EOM.TSHotelManagement.FormUI/Resources/picExtend.ImageHover.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/picLogo.BackgroundImage.png b/EOM.TSHotelManagement.FormUI/Resources/picLogo.BackgroundImage.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/picLogo.BackgroundImage.png
rename to EOM.TSHotelManagement.FormUI/Resources/picLogo.BackgroundImage.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/picRoom.Image.png b/EOM.TSHotelManagement.FormUI/Resources/picRoom.Image.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/picRoom.Image.png
rename to EOM.TSHotelManagement.FormUI/Resources/picRoom.Image.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/picRoom.ImageHover.png b/EOM.TSHotelManagement.FormUI/Resources/picRoom.ImageHover.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/picRoom.ImageHover.png
rename to EOM.TSHotelManagement.FormUI/Resources/picRoom.ImageHover.png
diff --git a/EOM.TSHotelManager.FormUI/Resources/settings2.png b/EOM.TSHotelManagement.FormUI/Resources/settings2.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/Resources/settings2.png
rename to EOM.TSHotelManagement.FormUI/Resources/settings2.png
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\344\270\212\344\274\240\347\205\247\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\344\270\252\344\272\272\344\270\255\345\277\203.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\344\272\272\345\212\233\350\265\204\346\272\220\351\203\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\344\277\256\346\224\271.png" "b/EOM.TSHotelManagement.FormUI/Resources/\344\277\256\346\224\271.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\344\277\256\346\224\271.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\344\277\256\346\224\271.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\205\263\344\272\216\346\210\221\344\273\254.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\206\205\346\216\247\351\203\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\210\207\346\215\242\350\264\246\345\217\267.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277(hover)icon.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\346\210\277icon.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\347\212\266\346\200\201.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\347\212\266\346\200\201.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\217\257\344\275\217\347\212\266\346\200\201.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\217\257\344\275\217\347\212\266\346\200\201.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\220\216\345\213\244\351\203\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\222\226\345\225\241.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\222\226\345\225\241.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\222\226\345\225\241.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\222\226\345\225\241.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\225\206\345\223\201\351\203\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\244\215\345\210\266.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\244\215\345\210\266.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\244\215\345\210\266.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\244\215\345\210\266.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\257\206\347\240\201.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\257\206\347\240\201.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\257\206\347\240\201.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\257\206\347\240\201.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277(hover)icon.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\346\210\277icon.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\347\212\266\346\200\201.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\347\212\266\346\200\201.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\267\262\344\275\217\347\212\266\346\200\201.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\267\262\344\275\217\347\212\266\346\200\201.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\345\270\270\350\247\204\351\203\250\351\227\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\346\200\273\347\273\217\345\212\236\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\346\211\223\345\215\241.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\211\223\345\215\241.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\346\211\223\345\215\241.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\346\211\223\345\215\241.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\346\227\251\344\270\212.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\227\251\344\270\212.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\346\227\251\344\270\212.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\346\227\251\344\270\212.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\346\231\256\351\200\232\344\274\232\345\221\230.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\346\234\210\344\272\256.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\234\210\344\272\256.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\346\234\210\344\272\256.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\346\234\210\344\272\256.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\346\243\200\346\237\245\346\233\264\346\226\260 (1).png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\346\263\250\351\224\200.png" "b/EOM.TSHotelManagement.FormUI/Resources/\346\263\250\351\224\200.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\346\263\250\351\224\200.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\346\263\250\351\224\200.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\347\224\250\346\210\267\347\231\273\345\275\225.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\224\250\346\210\267\347\231\273\345\275\225.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\347\224\250\346\210\267\347\231\273\345\275\225.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\347\224\250\346\210\267\347\231\273\345\275\225.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\347\231\275\351\207\221\344\274\232\345\221\230.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\347\233\221\347\256\241\345\260\217\347\273\204\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\347\263\273\347\273\237\347\256\241\347\220\206\345\221\230.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\347\273\217\347\220\206\351\203\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277(hover)icon.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\346\210\277icon.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\347\212\266\346\200\201.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\347\212\266\346\200\201.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\347\212\266\346\200\201.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\347\212\266\346\200\201.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\347\273\264\344\277\256\351\203\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277(hover)icon.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277icon1.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277icon1.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277icon1.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277icon1.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277\347\212\266\346\200\201.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277\347\212\266\346\200\201.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\350\204\217\346\210\277\347\212\266\346\200\201.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\350\204\217\346\210\277\347\212\266\346\200\201.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\350\264\242\345\212\241\351\203\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\350\264\246\345\217\267.png" "b/EOM.TSHotelManagement.FormUI/Resources/\350\264\246\345\217\267.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\350\264\246\345\217\267.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\350\264\246\345\217\267.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\350\275\254\346\215\242.ico" "b/EOM.TSHotelManagement.FormUI/Resources/\350\275\254\346\215\242.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\350\275\254\346\215\242.ico"
rename to "EOM.TSHotelManagement.FormUI/Resources/\350\275\254\346\215\242.ico"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\351\205\222\345\272\227\351\203\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\351\222\273\347\237\263\344\274\232\345\221\230.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\351\224\201\345\261\217.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\224\201\345\261\217.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\351\224\201\345\261\217.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\351\224\201\345\261\217.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277(hover)icon.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\346\210\277icon.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\347\212\266\346\200\201.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\347\212\266\346\200\201.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\351\242\204\347\272\246\347\212\266\346\200\201.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\351\242\204\347\272\246\347\212\266\346\200\201.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\351\244\220\351\245\256\351\203\250\345\215\241\347\211\207.png"
diff --git "a/EOM.TSHotelManager.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png" "b/EOM.TSHotelManagement.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png"
rename to "EOM.TSHotelManagement.FormUI/Resources/\351\273\204\351\207\221\344\274\232\345\221\230.png"
diff --git a/EOM.TSHotelManager.FormUI/TableComponent/LoadingProgress.cs b/EOM.TSHotelManagement.FormUI/TableComponent/LoadingProgress.cs
similarity index 72%
rename from EOM.TSHotelManager.FormUI/TableComponent/LoadingProgress.cs
rename to EOM.TSHotelManagement.FormUI/TableComponent/LoadingProgress.cs
index 820fe2f87eb9ba8f8b6e43f67712766b80885793..a551c83c2cb3c91b48b3a7b18905447a1f7f0dd9 100644
--- a/EOM.TSHotelManager.FormUI/TableComponent/LoadingProgress.cs
+++ b/EOM.TSHotelManagement.FormUI/TableComponent/LoadingProgress.cs
@@ -1,10 +1,9 @@
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public class LoadingProgress
     {
         private FrmProgress _frmProgress;
 
-        // 显示加载窗口
         public void Show()
         {
             if (_frmProgress == null || _frmProgress.IsDisposed)
@@ -12,16 +11,14 @@
                 _frmProgress = new FrmProgress();
             }
 
-            // 异步显示窗体以确保不阻塞调用线程
             Task.Run(() => _frmProgress.ShowDialog());
         }
 
-        // 关闭加载窗口
         public void Close()
         {
             if (_frmProgress != null && !_frmProgress.IsDisposed)
             {
-                _frmProgress.Invoke(new Action(() =>
+                _frmProgress.BeginInvoke(new Action(() =>
                 {
                     _frmProgress.Close();
                 }));
diff --git a/EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs b/EOM.TSHotelManagement.FormUI/TableComponent/TableComHelper.cs
similarity index 85%
rename from EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs
rename to EOM.TSHotelManagement.FormUI/TableComponent/TableComHelper.cs
index 84b79f511c2228d00bbb84aa92aab3795b87174c..c978fd92338c34e65cb85ad45e941f3063be7bd7 100644
--- a/EOM.TSHotelManager.FormUI/TableComponent/TableComHelper.cs
+++ b/EOM.TSHotelManagement.FormUI/TableComponent/TableComHelper.cs
@@ -1,9 +1,9 @@
 using AntdUI;
-using EOM.TSHotelManager.Common.Util;
+using EOM.TSHotelManagement.Common.Util;
 using System.Reflection;
 using System.Xml.Linq;
 
-namespace EOM.TSHotelManager.FormUI
+namespace EOM.TSHotelManagement.FormUI
 {
     public class TableComHelper
     {
@@ -13,8 +13,9 @@ namespace EOM.TSHotelManager.FormUI
         {
             try
             {
-                var xmlContent = Properties.Resources.EOM_TSHotelManager_Common_Core;
-                using (StringReader stringReader = new StringReader(xmlContent))
+                var xmlContent = Properties.Resources.TableColumns;
+                using (var memoryStream = new MemoryStream(xmlContent))
+                using (var stringReader = new StreamReader(memoryStream))
                 {
                     _xmlDoc = XDocument.Load(stringReader);
                 }
@@ -23,6 +24,7 @@ namespace EOM.TSHotelManager.FormUI
             {
                 throw new InvalidOperationException("无法加载嵌入的XML内容", ex);
             }
+
         }
 
         /// <summary>
@@ -72,25 +74,29 @@ namespace EOM.TSHotelManager.FormUI
 
                 foreach (var prop in properties)
                 {
-                    // 获取 UIDisplay 特性
                     var displayAttribute = prop.GetCustomAttribute<UIDisplayAttribute>();
 
-                    // 如果没有 UIDisplay 特性，则跳过
                     if (displayAttribute == null)
                     {
                         continue;
                     }
 
-                    var propName = prop.Name; // 获取属性名
-                    var propValue = prop.GetValue(data); // 获取属性值
-                    var propType = prop.PropertyType; // 获取属性的类型
+                    var propName = prop.Name;
+                    var propValue = prop.GetValue(data);
+                    var propType = prop.PropertyType;
 
-                    // 根据字段的类型做特定处理
                     if (propType == typeof(bool) || propType == typeof(int))
                     {
-                        var boolValue = Convert.ToBoolean(propValue);
-                        var cellTag = boolValue ? new AntdUI.CellTag("是", AntdUI.TTypeMini.Error) : new AntdUI.CellTag("否", AntdUI.TTypeMini.Success);
-                        antItems.Add(new AntdUI.AntItem(propName, cellTag));
+                        if (displayAttribute.IsNumber)
+                        {
+                            antItems.Add(new AntdUI.AntItem(propName, propValue?.ToString()));
+                        }
+                        else
+                        {
+                            var boolValue = Convert.ToBoolean(propValue);
+                            var cellTag = boolValue ? new AntdUI.CellTag("是", AntdUI.TTypeMini.Error) : new AntdUI.CellTag("否", AntdUI.TTypeMini.Success);
+                            antItems.Add(new AntdUI.AntItem(propName, cellTag));
+                        }
                     }
                     else if (propType == typeof(string))
                     {
diff --git a/EOM.TSHotelManager.FormUI/app.manifest b/EOM.TSHotelManagement.FormUI/app.manifest
similarity index 100%
rename from EOM.TSHotelManager.FormUI/app.manifest
rename to EOM.TSHotelManagement.FormUI/app.manifest
diff --git a/EOM.TSHotelManager.FormUI/icon/add to card.ico b/EOM.TSHotelManagement.FormUI/icon/add to card.ico
similarity index 100%
rename from EOM.TSHotelManager.FormUI/icon/add to card.ico
rename to EOM.TSHotelManagement.FormUI/icon/add to card.ico
diff --git a/EOM.TSHotelManager.FormUI/icon/add_person.ico b/EOM.TSHotelManagement.FormUI/icon/add_person.ico
similarity index 100%
rename from EOM.TSHotelManager.FormUI/icon/add_person.ico
rename to EOM.TSHotelManagement.FormUI/icon/add_person.ico
diff --git a/EOM.TSHotelManager.FormUI/icon/check-out2.ico b/EOM.TSHotelManagement.FormUI/icon/check-out2.ico
similarity index 100%
rename from EOM.TSHotelManager.FormUI/icon/check-out2.ico
rename to EOM.TSHotelManagement.FormUI/icon/check-out2.ico
diff --git a/EOM.TSHotelManager.FormUI/icon/checkin.ico b/EOM.TSHotelManagement.FormUI/icon/checkin.ico
similarity index 100%
rename from EOM.TSHotelManager.FormUI/icon/checkin.ico
rename to EOM.TSHotelManagement.FormUI/icon/checkin.ico
diff --git a/EOM.TSHotelManager.FormUI/icon/customers.ico b/EOM.TSHotelManagement.FormUI/icon/customers.ico
similarity index 100%
rename from EOM.TSHotelManager.FormUI/icon/customers.ico
rename to EOM.TSHotelManagement.FormUI/icon/customers.ico
diff --git a/EOM.TSHotelManager.FormUI/icon/time.ico b/EOM.TSHotelManagement.FormUI/icon/time.ico
similarity index 100%
rename from EOM.TSHotelManager.FormUI/icon/time.ico
rename to EOM.TSHotelManagement.FormUI/icon/time.ico
diff --git "a/EOM.TSHotelManager.FormUI/icon/\344\274\240\350\276\223_\344\270\212\344\274\240.ico" "b/EOM.TSHotelManagement.FormUI/icon/\344\274\240\350\276\223_\344\270\212\344\274\240.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\344\274\240\350\276\223_\344\270\212\344\274\240.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\344\274\240\350\276\223_\344\270\212\344\274\240.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\345\205\263\344\272\216\346\210\221\344\273\254.ico" "b/EOM.TSHotelManagement.FormUI/icon/\345\205\263\344\272\216\346\210\221\344\273\254.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\345\205\263\344\272\216\346\210\221\344\273\254.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\345\205\263\344\272\216\346\210\221\344\273\254.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\345\216\206\345\217\262\345\205\254\345\221\212.ico" "b/EOM.TSHotelManagement.FormUI/icon/\345\216\206\345\217\262\345\205\254\345\221\212.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\345\216\206\345\217\262\345\205\254\345\221\212.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\345\216\206\345\217\262\345\205\254\345\221\212.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\345\221\230\345\267\245\344\273\273\345\221\275.ico" "b/EOM.TSHotelManagement.FormUI/icon/\345\221\230\345\267\245\344\273\273\345\221\275.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\345\221\230\345\267\245\344\273\273\345\221\275.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\345\221\230\345\267\245\344\273\273\345\221\275.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\345\221\230\345\267\245\347\256\241\347\220\206.ico" "b/EOM.TSHotelManagement.FormUI/icon/\345\221\230\345\267\245\347\256\241\347\220\206.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\345\221\230\345\267\245\347\256\241\347\220\206.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\345\221\230\345\267\245\347\256\241\347\220\206.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\345\225\206\345\223\201\347\256\241\347\220\206.ico" "b/EOM.TSHotelManagement.FormUI/icon/\345\225\206\345\223\201\347\256\241\347\220\206.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\345\225\206\345\223\201\347\256\241\347\220\206.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\345\225\206\345\223\201\347\256\241\347\220\206.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\345\245\226\346\203\251.ico" "b/EOM.TSHotelManagement.FormUI/icon/\345\245\226\346\203\251.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\345\245\226\346\203\251.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\345\245\226\346\203\251.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\345\255\246\345\216\206.ico" "b/EOM.TSHotelManagement.FormUI/icon/\345\255\246\345\216\206.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\345\255\246\345\216\206.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\345\255\246\345\216\206.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\345\256\242\346\210\267\344\277\241\346\201\257.ico" "b/EOM.TSHotelManagement.FormUI/icon/\345\256\242\346\210\267\344\277\241\346\201\257.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\345\256\242\346\210\267\344\277\241\346\201\257.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\345\256\242\346\210\267\344\277\241\346\201\257.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\345\256\242\346\210\267\347\256\241\347\220\206.ico" "b/EOM.TSHotelManagement.FormUI/icon/\345\256\242\346\210\267\347\256\241\347\220\206.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\345\256\242\346\210\267\347\256\241\347\220\206.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\345\256\242\346\210\267\347\256\241\347\220\206.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\200\247 \345\210\253.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\200\247 \345\210\253.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\200\247 \345\210\253.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\200\247 \345\210\253.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\210\277\346\200\201\345\233\276.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\210\277\346\200\201\345\233\276.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\210\277\346\200\201\345\233\276.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\210\277\346\200\201\345\233\276.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\210\277\351\227\264\344\277\256\346\224\271.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\212\245\350\241\250.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\212\245\350\241\250.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\212\245\350\241\250.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\212\245\350\241\250.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\223\215\344\275\234\350\256\260\345\275\225.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\223\215\344\275\234\350\256\260\345\275\225.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\223\215\344\275\234\350\256\260\345\275\225.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\223\215\344\275\234\350\256\260\345\275\225.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\226\260\345\242\236.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\226\260\345\242\236.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\226\260\345\242\236.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\226\260\345\242\236.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\235\203\351\231\220.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\235\203\351\231\220.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\235\203\351\231\220.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\235\203\351\231\220.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\260\221\346\227\217.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\260\221\346\227\217.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\260\221\346\227\217.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\260\221\346\227\217.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\260\264\347\224\265.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\260\264\347\224\265.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\260\264\347\224\265.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\260\264\347\224\265.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\266\210\350\264\271\350\264\246\345\215\225.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\266\210\350\264\271\350\264\246\345\215\225.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\266\210\350\264\271\350\264\246\345\215\225.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\266\210\350\264\271\350\264\246\345\215\225.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\267\273\345\212\240\345\221\230\345\267\245.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\267\273\345\212\240\345\221\230\345\267\245.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\267\273\345\212\240\345\221\230\345\267\245.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\267\273\345\212\240\345\221\230\345\267\245.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.ico" "b/EOM.TSHotelManagement.FormUI/icon/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\346\267\273\345\212\240\347\256\241\347\220\206\345\221\230.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\347\233\221\347\256\241\347\273\237\350\256\241.ico" "b/EOM.TSHotelManagement.FormUI/icon/\347\233\221\347\256\241\347\273\237\350\256\241.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\347\233\221\347\256\241\347\273\237\350\256\241.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\347\233\221\347\256\241\347\273\237\350\256\241.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\347\233\276\347\211\214.ico" "b/EOM.TSHotelManagement.FormUI/icon/\347\233\276\347\211\214.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\347\233\276\347\211\214.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\347\233\276\347\211\214.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\347\246\201\347\224\250.ico" "b/EOM.TSHotelManagement.FormUI/icon/\347\246\201\347\224\250.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\347\246\201\347\224\250.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\347\246\201\347\224\250.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\347\255\211\347\272\247.ico" "b/EOM.TSHotelManagement.FormUI/icon/\347\255\211\347\272\247.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\347\255\211\347\272\247.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\347\255\211\347\272\247.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\350\201\214\344\275\215.ico" "b/EOM.TSHotelManagement.FormUI/icon/\350\201\214\344\275\215.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\350\201\214\344\275\215.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\350\201\214\344\275\215.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\350\247\204\345\210\231.ico" "b/EOM.TSHotelManagement.FormUI/icon/\350\247\204\345\210\231.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\350\247\204\345\210\231.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\350\247\204\345\210\231.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\350\264\242\345\212\241\350\264\246\345\215\225.ico" "b/EOM.TSHotelManagement.FormUI/icon/\350\264\242\345\212\241\350\264\246\345\215\225.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\350\264\242\345\212\241\350\264\246\345\215\225.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\350\264\242\345\212\241\350\264\246\345\215\225.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\350\275\254\346\215\242.ico" "b/EOM.TSHotelManagement.FormUI/icon/\350\275\254\346\215\242.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\350\275\254\346\215\242.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\350\275\254\346\215\242.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\351\203\250\351\227\250.ico" "b/EOM.TSHotelManagement.FormUI/icon/\351\203\250\351\227\250.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\351\203\250\351\227\250.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\351\203\250\351\227\250.ico"
diff --git "a/EOM.TSHotelManager.FormUI/icon/\351\242\204\347\272\246.ico" "b/EOM.TSHotelManagement.FormUI/icon/\351\242\204\347\272\246.ico"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/icon/\351\242\204\347\272\246.ico"
rename to "EOM.TSHotelManagement.FormUI/icon/\351\242\204\347\272\246.ico"
diff --git a/EOM.TSHotelManager.FormUI/images/blue_refresh.png b/EOM.TSHotelManagement.FormUI/images/blue_refresh.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/images/blue_refresh.png
rename to EOM.TSHotelManagement.FormUI/images/blue_refresh.png
diff --git a/EOM.TSHotelManager.FormUI/images/lockicon.png b/EOM.TSHotelManagement.FormUI/images/lockicon.png
similarity index 100%
rename from EOM.TSHotelManager.FormUI/images/lockicon.png
rename to EOM.TSHotelManagement.FormUI/images/lockicon.png
diff --git "a/EOM.TSHotelManager.FormUI/images/\345\244\215\345\210\266.png" "b/EOM.TSHotelManagement.FormUI/images/\345\244\215\345\210\266.png"
similarity index 100%
rename from "EOM.TSHotelManager.FormUI/images/\345\244\215\345\210\266.png"
rename to "EOM.TSHotelManagement.FormUI/images/\345\244\215\345\210\266.png"
diff --git a/EOM.TSHotelManager.FormUI/logo.ico b/EOM.TSHotelManagement.FormUI/logo.ico
similarity index 100%
rename from EOM.TSHotelManager.FormUI/logo.ico
rename to EOM.TSHotelManagement.FormUI/logo.ico
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.Designer.cs
deleted file mode 100644
index bb584a2d745352b4f3fe491cf385dc83eb6bc8e6..0000000000000000000000000000000000000000
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmCustomerManager.Designer.cs
+++ /dev/null
@@ -1,488 +0,0 @@
-namespace EOM.TSHotelManager.FormUI
-{
-    partial class FrmCustomerManager
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            toolTip1 = new System.Windows.Forms.ToolTip(components);
-            dgvCustomerList = new Sunny.UI.UIDataGridView();
-            CustoNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            CustoName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            CustoSex = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            CustoTel = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            CustoBirth = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            typeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            PassportName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            CustoAdress = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            cmsCustoManager = new Sunny.UI.UIContextMenuStrip();
-            tsmiCustoNo = new System.Windows.Forms.ToolStripMenuItem();
-            uiGroupBox1 = new Sunny.UI.UIGroupBox();
-            txtCustoName = new Sunny.UI.UITextBox();
-            label1 = new System.Windows.Forms.Label();
-            txtCustoNo = new Sunny.UI.UITextBox();
-            label3 = new System.Windows.Forms.Label();
-            btnPg = new Sunny.UI.UIPagination();
-            uiLine1 = new Sunny.UI.UILine();
-            cbOnlyVip = new Sunny.UI.UICheckBox();
-            btnSerach = new AntdUI.Button();
-            btnAddCusto = new AntdUI.Button();
-            btnUpdCustomer = new AntdUI.Button();
-            ((System.ComponentModel.ISupportInitialize)dgvCustomerList).BeginInit();
-            cmsCustoManager.SuspendLayout();
-            uiGroupBox1.SuspendLayout();
-            SuspendLayout();
-            // 
-            // toolTip1
-            // 
-            toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
-            toolTip1.ToolTipTitle = "获取账号";
-            // 
-            // dgvCustomerList
-            // 
-            dgvCustomerList.AllowUserToAddRows = false;
-            dgvCustomerList.AllowUserToDeleteRows = false;
-            dgvCustomerList.AllowUserToResizeColumns = false;
-            dgvCustomerList.AllowUserToResizeRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(235, 243, 255);
-            dgvCustomerList.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            dgvCustomerList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            dgvCustomerList.BackgroundColor = System.Drawing.Color.White;
-            dgvCustomerList.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dgvCustomerList.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;
-            dgvCustomerList.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(80, 160, 255);
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            dgvCustomerList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            dgvCustomerList.ColumnHeadersHeight = 25;
-            dgvCustomerList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            dgvCustomerList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { CustoNo, CustoName, CustoSex, CustoTel, CustoBirth, typeName, PassportName, CustoAdress, Column1, Column2, Column3, Column4, Column5, Column6, Column7, Column8, Column9 });
-            dgvCustomerList.ContextMenuStrip = cmsCustoManager;
-            dgvCustomerList.EnableHeadersVisualStyles = false;
-            dgvCustomerList.Font = new System.Drawing.Font("微软雅黑", 12F);
-            dgvCustomerList.GridColor = System.Drawing.Color.FromArgb(80, 160, 255);
-            dgvCustomerList.Location = new System.Drawing.Point(14, 7);
-            dgvCustomerList.Margin = new System.Windows.Forms.Padding(4);
-            dgvCustomerList.Name = "dgvCustomerList";
-            dgvCustomerList.ReadOnly = true;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(235, 243, 255);
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(80, 160, 255);
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            dgvCustomerList.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
-            dgvCustomerList.RowHeadersVisible = false;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.White;
-            dgvCustomerList.RowsDefaultCellStyle = dataGridViewCellStyle4;
-            dgvCustomerList.RowTemplate.Height = 29;
-            dgvCustomerList.SelectedIndex = -1;
-            dgvCustomerList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            dgvCustomerList.Size = new System.Drawing.Size(1053, 352);
-            dgvCustomerList.StripeOddColor = System.Drawing.Color.FromArgb(235, 243, 255);
-            dgvCustomerList.Style = Sunny.UI.UIStyle.Custom;
-            dgvCustomerList.TabIndex = 83;
-            toolTip1.SetToolTip(dgvCustomerList, "选中客户右键可进行更多操作");
-            dgvCustomerList.CellClick += dgvCustomerList_CellClick;
-            // 
-            // CustoNo
-            // 
-            CustoNo.DataPropertyName = "CustoNo";
-            CustoNo.HeaderText = "客户编号";
-            CustoNo.Name = "CustoNo";
-            CustoNo.ReadOnly = true;
-            // 
-            // CustoName
-            // 
-            CustoName.DataPropertyName = "CustoName";
-            CustoName.HeaderText = "客户姓名";
-            CustoName.Name = "CustoName";
-            CustoName.ReadOnly = true;
-            // 
-            // CustoSex
-            // 
-            CustoSex.DataPropertyName = "SexName";
-            CustoSex.HeaderText = "性别";
-            CustoSex.Name = "CustoSex";
-            CustoSex.ReadOnly = true;
-            // 
-            // CustoTel
-            // 
-            CustoTel.DataPropertyName = "CustoTel";
-            CustoTel.HeaderText = "联系方式";
-            CustoTel.Name = "CustoTel";
-            CustoTel.ReadOnly = true;
-            // 
-            // CustoBirth
-            // 
-            CustoBirth.DataPropertyName = "CustoBirth";
-            CustoBirth.HeaderText = "出生日期";
-            CustoBirth.Name = "CustoBirth";
-            CustoBirth.ReadOnly = true;
-            // 
-            // typeName
-            // 
-            typeName.DataPropertyName = "typeName";
-            typeName.HeaderText = "客户类型";
-            typeName.Name = "typeName";
-            typeName.ReadOnly = true;
-            // 
-            // PassportName
-            // 
-            PassportName.DataPropertyName = "PassportName";
-            PassportName.HeaderText = "证件类型";
-            PassportName.Name = "PassportName";
-            PassportName.ReadOnly = true;
-            // 
-            // CustoAdress
-            // 
-            CustoAdress.DataPropertyName = "CustoAdress";
-            CustoAdress.HeaderText = "客户地址";
-            CustoAdress.Name = "CustoAdress";
-            CustoAdress.ReadOnly = true;
-            // 
-            // Column1
-            // 
-            Column1.DataPropertyName = "PassportType";
-            Column1.HeaderText = "Column1";
-            Column1.Name = "Column1";
-            Column1.ReadOnly = true;
-            Column1.Visible = false;
-            // 
-            // Column2
-            // 
-            Column2.DataPropertyName = "CustoType";
-            Column2.HeaderText = "Column2";
-            Column2.Name = "Column2";
-            Column2.ReadOnly = true;
-            Column2.Visible = false;
-            // 
-            // Column3
-            // 
-            Column3.DataPropertyName = "CustoID";
-            Column3.HeaderText = "Column3";
-            Column3.Name = "Column3";
-            Column3.ReadOnly = true;
-            Column3.Visible = false;
-            // 
-            // Column4
-            // 
-            Column4.DataPropertyName = "CustoSex";
-            Column4.HeaderText = "Column4";
-            Column4.Name = "Column4";
-            Column4.ReadOnly = true;
-            Column4.Visible = false;
-            // 
-            // Column5
-            // 
-            Column5.DataPropertyName = "delete_mk";
-            Column5.HeaderText = "Column5";
-            Column5.Name = "Column5";
-            Column5.ReadOnly = true;
-            Column5.Visible = false;
-            // 
-            // Column6
-            // 
-            Column6.DataPropertyName = "datains_usr";
-            Column6.HeaderText = "Column6";
-            Column6.Name = "Column6";
-            Column6.ReadOnly = true;
-            Column6.Visible = false;
-            // 
-            // Column7
-            // 
-            Column7.DataPropertyName = "datains_date";
-            Column7.HeaderText = "Column7";
-            Column7.Name = "Column7";
-            Column7.ReadOnly = true;
-            Column7.Visible = false;
-            // 
-            // Column8
-            // 
-            Column8.DataPropertyName = "datachg_usr";
-            Column8.HeaderText = "Column8";
-            Column8.Name = "Column8";
-            Column8.ReadOnly = true;
-            Column8.Visible = false;
-            // 
-            // Column9
-            // 
-            Column9.DataPropertyName = "datachg_date";
-            Column9.HeaderText = "Column9";
-            Column9.Name = "Column9";
-            Column9.ReadOnly = true;
-            Column9.Visible = false;
-            // 
-            // cmsCustoManager
-            // 
-            cmsCustoManager.BackColor = System.Drawing.Color.FromArgb(243, 249, 255);
-            cmsCustoManager.Font = new System.Drawing.Font("微软雅黑", 12F);
-            cmsCustoManager.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { tsmiCustoNo });
-            cmsCustoManager.Name = "cmsCustoManager";
-            cmsCustoManager.Size = new System.Drawing.Size(177, 30);
-            // 
-            // tsmiCustoNo
-            // 
-            tsmiCustoNo.Image = Properties.Resources.复制;
-            tsmiCustoNo.Name = "tsmiCustoNo";
-            tsmiCustoNo.Size = new System.Drawing.Size(176, 26);
-            tsmiCustoNo.Text = "复制用户编号";
-            tsmiCustoNo.Click += tsmiCustoNo_Click;
-            // 
-            // uiGroupBox1
-            // 
-            uiGroupBox1.Controls.Add(txtCustoName);
-            uiGroupBox1.Controls.Add(label1);
-            uiGroupBox1.Controls.Add(txtCustoNo);
-            uiGroupBox1.Controls.Add(label3);
-            uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            uiGroupBox1.Location = new System.Drawing.Point(14, 405);
-            uiGroupBox1.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7);
-            uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1);
-            uiGroupBox1.Name = "uiGroupBox1";
-            uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 45, 0, 0);
-            uiGroupBox1.Size = new System.Drawing.Size(591, 81);
-            uiGroupBox1.TabIndex = 119;
-            uiGroupBox1.Text = "条件搜索";
-            uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // txtCustoName
-            // 
-            txtCustoName.Cursor = System.Windows.Forms.Cursors.IBeam;
-            txtCustoName.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
-            txtCustoName.Location = new System.Drawing.Point(387, 34);
-            txtCustoName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            txtCustoName.MinimumSize = new System.Drawing.Size(1, 1);
-            txtCustoName.Name = "txtCustoName";
-            txtCustoName.Padding = new System.Windows.Forms.Padding(5);
-            txtCustoName.Radius = 20;
-            txtCustoName.ShowText = false;
-            txtCustoName.Size = new System.Drawing.Size(173, 33);
-            txtCustoName.TabIndex = 94;
-            txtCustoName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            txtCustoName.Watermark = "";
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
-            label1.Location = new System.Drawing.Point(292, 37);
-            label1.Name = "label1";
-            label1.Size = new System.Drawing.Size(88, 25);
-            label1.TabIndex = 93;
-            label1.Text = "客户姓名";
-            // 
-            // txtCustoNo
-            // 
-            txtCustoNo.Cursor = System.Windows.Forms.Cursors.IBeam;
-            txtCustoNo.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
-            txtCustoNo.Location = new System.Drawing.Point(112, 34);
-            txtCustoNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            txtCustoNo.MinimumSize = new System.Drawing.Size(1, 1);
-            txtCustoNo.Name = "txtCustoNo";
-            txtCustoNo.Padding = new System.Windows.Forms.Padding(5);
-            txtCustoNo.Radius = 20;
-            txtCustoNo.ShowText = false;
-            txtCustoNo.Size = new System.Drawing.Size(173, 33);
-            txtCustoNo.TabIndex = 92;
-            txtCustoNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            txtCustoNo.Watermark = "";
-            // 
-            // label3
-            // 
-            label3.AutoSize = true;
-            label3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 134);
-            label3.Location = new System.Drawing.Point(17, 37);
-            label3.Name = "label3";
-            label3.Size = new System.Drawing.Size(88, 25);
-            label3.TabIndex = 91;
-            label3.Text = "客户编号";
-            // 
-            // btnPg
-            // 
-            btnPg.BackColor = System.Drawing.Color.Transparent;
-            btnPg.ButtonInterval = 5;
-            btnPg.Font = new System.Drawing.Font("微软雅黑", 12F);
-            btnPg.Location = new System.Drawing.Point(14, 370);
-            btnPg.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7);
-            btnPg.MinimumSize = new System.Drawing.Size(1, 1);
-            btnPg.Name = "btnPg";
-            btnPg.PageSize = 15;
-            btnPg.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
-            btnPg.ShowText = false;
-            btnPg.Size = new System.Drawing.Size(643, 35);
-            btnPg.TabIndex = 120;
-            btnPg.Text = null;
-            btnPg.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            btnPg.PageChanged += btnPg_PageChanged;
-            // 
-            // uiLine1
-            // 
-            uiLine1.BackColor = System.Drawing.Color.Transparent;
-            uiLine1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            uiLine1.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
-            uiLine1.Location = new System.Drawing.Point(776, 377);
-            uiLine1.Margin = new System.Windows.Forms.Padding(4);
-            uiLine1.MinimumSize = new System.Drawing.Size(2, 3);
-            uiLine1.Name = "uiLine1";
-            uiLine1.Size = new System.Drawing.Size(291, 24);
-            uiLine1.TabIndex = 124;
-            uiLine1.Text = "右键可复制快速客户编号";
-            // 
-            // cbOnlyVip
-            // 
-            cbOnlyVip.Cursor = System.Windows.Forms.Cursors.Hand;
-            cbOnlyVip.Font = new System.Drawing.Font("微软雅黑", 12F);
-            cbOnlyVip.ForeColor = System.Drawing.Color.FromArgb(48, 48, 48);
-            cbOnlyVip.Location = new System.Drawing.Point(657, 377);
-            cbOnlyVip.Margin = new System.Windows.Forms.Padding(4);
-            cbOnlyVip.MinimumSize = new System.Drawing.Size(1, 1);
-            cbOnlyVip.Name = "cbOnlyVip";
-            cbOnlyVip.Padding = new System.Windows.Forms.Padding(26, 0, 0, 0);
-            cbOnlyVip.Size = new System.Drawing.Size(111, 24);
-            cbOnlyVip.Style = Sunny.UI.UIStyle.Custom;
-            cbOnlyVip.TabIndex = 126;
-            cbOnlyVip.Text = "仅查看会员";
-            cbOnlyVip.CheckedChanged += cbOnlyVip_CheckedChanged;
-            // 
-            // btnSerach
-            // 
-            btnSerach.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
-            btnSerach.Location = new System.Drawing.Point(613, 426);
-            btnSerach.Name = "btnSerach";
-            btnSerach.Radius = 15;
-            btnSerach.Size = new System.Drawing.Size(113, 54);
-            btnSerach.TabIndex = 127;
-            btnSerach.Text = "搜    索";
-            btnSerach.Type = AntdUI.TTypeMini.Primary;
-            btnSerach.Click += btnSerach_BtnClick;
-            // 
-            // btnAddCusto
-            // 
-            btnAddCusto.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
-            btnAddCusto.Location = new System.Drawing.Point(783, 426);
-            btnAddCusto.Name = "btnAddCusto";
-            btnAddCusto.Radius = 15;
-            btnAddCusto.Size = new System.Drawing.Size(113, 54);
-            btnAddCusto.TabIndex = 128;
-            btnAddCusto.Text = "添加客户";
-            btnAddCusto.Type = AntdUI.TTypeMini.Primary;
-            btnAddCusto.Click += btnAddCusto_BtnClick;
-            // 
-            // btnUpdCustomer
-            // 
-            btnUpdCustomer.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
-            btnUpdCustomer.Location = new System.Drawing.Point(953, 426);
-            btnUpdCustomer.Name = "btnUpdCustomer";
-            btnUpdCustomer.Radius = 15;
-            btnUpdCustomer.Size = new System.Drawing.Size(113, 54);
-            btnUpdCustomer.TabIndex = 129;
-            btnUpdCustomer.Text = "修改客户";
-            btnUpdCustomer.Type = AntdUI.TTypeMini.Primary;
-            btnUpdCustomer.Click += btnUpdCustomer_Click;
-            // 
-            // FrmCustomerManager
-            // 
-            AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
-            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            BackColor = System.Drawing.Color.FromArgb(235, 243, 255);
-            ClientSize = new System.Drawing.Size(1072, 490);
-            Controls.Add(btnUpdCustomer);
-            Controls.Add(btnAddCusto);
-            Controls.Add(btnSerach);
-            Controls.Add(cbOnlyVip);
-            Controls.Add(uiLine1);
-            Controls.Add(btnPg);
-            Controls.Add(uiGroupBox1);
-            Controls.Add(dgvCustomerList);
-            FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            Margin = new System.Windows.Forms.Padding(4);
-            Name = "FrmCustomerManager";
-            StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            Text = "TS酒店管理系统";
-            Load += FrmCustomerManager_Load;
-            ((System.ComponentModel.ISupportInitialize)dgvCustomerList).EndInit();
-            cmsCustoManager.ResumeLayout(false);
-            uiGroupBox1.ResumeLayout(false);
-            uiGroupBox1.PerformLayout();
-            ResumeLayout(false);
-        }
-
-        #endregion
-        private System.Windows.Forms.ToolTip toolTip1;
-        private Sunny.UI.UIDataGridView dgvCustomerList;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CustoNo;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CustoName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CustoSex;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CustoTel;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CustoBirth;
-        private System.Windows.Forms.DataGridViewTextBoxColumn typeName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn PassportName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CustoAdress;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
-        private Sunny.UI.UIGroupBox uiGroupBox1;
-        private Sunny.UI.UITextBox txtCustoNo;
-        private System.Windows.Forms.Label label3;
-        private Sunny.UI.UITextBox txtCustoName;
-        private System.Windows.Forms.Label label1;
-        private Sunny.UI.UIPagination btnPg;
-        private Sunny.UI.UIContextMenuStrip cmsCustoManager;
-        private System.Windows.Forms.ToolStripMenuItem tsmiCustoNo;
-        private Sunny.UI.UILine uiLine1;
-        private Sunny.UI.UICheckBox cbOnlyVip;
-        private AntdUI.Button btnSerach;
-        private AntdUI.Button btnAddCusto;
-        private AntdUI.Button btnUpdCustomer;
-    }
-}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.cs
deleted file mode 100644
index 56f7e6c97acac1933d9394afd495174400a4bcdc..0000000000000000000000000000000000000000
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmProgress.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using AntdUI;
-
-namespace EOM.TSHotelManager.FormUI
-{
-    public partial class FrmProgress : Window
-    {
-        public FrmProgress()
-        {
-            InitializeComponent();
-            // 创建ProgressBar控件并配置
-            ProgressBar progressBar = new ProgressBar
-            {
-                Dock = DockStyle.Fill,
-                Style = ProgressBarStyle.Marquee,
-                MarqueeAnimationSpeed = 30,
-                Size = new Size(196, 23)
-            };
-
-            this.Controls.Add(progressBar);
-            this.Text = "Loading...";
-            this.TopMost = true;
-            this.Size = new System.Drawing.Size(196, 23);
-            this.FormBorderStyle = FormBorderStyle.FixedDialog;
-            this.StartPosition = FormStartPosition.CenterScreen;
-            this.ControlBox = false;
-        }
-
-        private void FrmProgress_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.Designer.cs b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.Designer.cs
deleted file mode 100644
index 5767652a3906418ab9ce7e5e750f74d7230c3076..0000000000000000000000000000000000000000
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.Designer.cs
+++ /dev/null
@@ -1,764 +0,0 @@
-namespace EOM.TSHotelManager.FormUI
-{
-    partial class FrmSellThing
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSellThing));
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.txtPrice = new Sunny.UI.UITextBox();
-            this.uiLabel6 = new Sunny.UI.UILabel();
-            this.nudNum = new Sunny.UI.UIDoubleUpDown();
-            this.uiLabel5 = new Sunny.UI.UILabel();
-            this.txtSellName = new Sunny.UI.UITextBox();
-            this.uiLabel4 = new Sunny.UI.UILabel();
-            this.txtSellNo = new Sunny.UI.UITextBox();
-            this.uiLabel3 = new Sunny.UI.UILabel();
-            this.dgvRoomSell = new Sunny.UI.UIDataGridView();
-            this.clRoomNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clCustoNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clSpendName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clSpendAmount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clSpendPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clSpendMoney = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clSpendTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clSpendNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dgvSellthing = new Sunny.UI.UIDataGridView();
-            this.clSellNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clSellName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clSellPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clFormat = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.clStock = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.btnAdd = new Sunny.UI.UIButton();
-            this.btnCancel = new Sunny.UI.UIButton();
-            this.btnFind = new Sunny.UI.UIButton();
-            this.txtFind = new Sunny.UI.UITextBox();
-            this.uiLabel1 = new Sunny.UI.UILabel();
-            this.uiLabel2 = new Sunny.UI.UILabel();
-            this.txtRoomNo = new Sunny.UI.UITextBox();
-            this.lblState = new Sunny.UI.UILabel();
-            this.btnCheck = new Sunny.UI.UIButton();
-            this.groupBox2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRoomSell)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvSellthing)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.txtPrice);
-            this.groupBox2.Controls.Add(this.uiLabel6);
-            this.groupBox2.Controls.Add(this.nudNum);
-            this.groupBox2.Controls.Add(this.uiLabel5);
-            this.groupBox2.Controls.Add(this.txtSellName);
-            this.groupBox2.Controls.Add(this.uiLabel4);
-            this.groupBox2.Controls.Add(this.txtSellNo);
-            this.groupBox2.Controls.Add(this.uiLabel3);
-            this.groupBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBox2.Location = new System.Drawing.Point(617, 88);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(452, 123);
-            this.groupBox2.TabIndex = 5;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "订购中心";
-            // 
-            // txtPrice
-            // 
-            this.txtPrice.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.txtPrice.FillColor = System.Drawing.Color.White;
-            this.txtPrice.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.txtPrice.Location = new System.Drawing.Point(310, 74);
-            this.txtPrice.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.txtPrice.Maximum = 2147483647D;
-            this.txtPrice.Minimum = -2147483648D;
-            this.txtPrice.MinimumSize = new System.Drawing.Size(1, 1);
-            this.txtPrice.Name = "txtPrice";
-            this.txtPrice.Padding = new System.Windows.Forms.Padding(5);
-            this.txtPrice.Radius = 20;
-            this.txtPrice.ReadOnly = true;
-            this.txtPrice.Size = new System.Drawing.Size(116, 29);
-            this.txtPrice.Style = Sunny.UI.UIStyle.Custom;
-            this.txtPrice.TabIndex = 30;
-            this.txtPrice.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // uiLabel6
-            // 
-            this.uiLabel6.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.uiLabel6.Location = new System.Drawing.Point(258, 74);
-            this.uiLabel6.Name = "uiLabel6";
-            this.uiLabel6.Size = new System.Drawing.Size(61, 29);
-            this.uiLabel6.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel6.TabIndex = 29;
-            this.uiLabel6.Text = "单价：";
-            this.uiLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // nudNum
-            // 
-            this.nudNum.AutoValidate = System.Windows.Forms.AutoValidate.Disable;
-            this.nudNum.Font = new System.Drawing.Font("新宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.nudNum.Location = new System.Drawing.Point(310, 30);
-            this.nudNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.nudNum.Maximum = 9999D;
-            this.nudNum.Minimum = 0D;
-            this.nudNum.MinimumSize = new System.Drawing.Size(100, 0);
-            this.nudNum.Name = "nudNum";
-            this.nudNum.Radius = 20;
-            this.nudNum.Size = new System.Drawing.Size(116, 29);
-            this.nudNum.Step = 1D;
-            this.nudNum.Style = Sunny.UI.UIStyle.Custom;
-            this.nudNum.StyleCustomMode = true;
-            this.nudNum.TabIndex = 25;
-            this.nudNum.Text = null;
-            this.nudNum.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
-            this.nudNum.Value = 0D;
-            this.nudNum.ValueChanged += new Sunny.UI.UIDoubleUpDown.OnValueChanged(this.nudNum_ValueChanged);
-            // 
-            // uiLabel5
-            // 
-            this.uiLabel5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.uiLabel5.Location = new System.Drawing.Point(258, 30);
-            this.uiLabel5.Name = "uiLabel5";
-            this.uiLabel5.Size = new System.Drawing.Size(61, 29);
-            this.uiLabel5.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel5.TabIndex = 28;
-            this.uiLabel5.Text = "数量：";
-            this.uiLabel5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // txtSellName
-            // 
-            this.txtSellName.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.txtSellName.FillColor = System.Drawing.Color.White;
-            this.txtSellName.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.txtSellName.Location = new System.Drawing.Point(107, 74);
-            this.txtSellName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.txtSellName.Maximum = 2147483647D;
-            this.txtSellName.Minimum = -2147483648D;
-            this.txtSellName.MinimumSize = new System.Drawing.Size(1, 1);
-            this.txtSellName.Name = "txtSellName";
-            this.txtSellName.Padding = new System.Windows.Forms.Padding(5);
-            this.txtSellName.Radius = 20;
-            this.txtSellName.ReadOnly = true;
-            this.txtSellName.Size = new System.Drawing.Size(145, 29);
-            this.txtSellName.Style = Sunny.UI.UIStyle.Custom;
-            this.txtSellName.TabIndex = 27;
-            this.txtSellName.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // uiLabel4
-            // 
-            this.uiLabel4.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.uiLabel4.Location = new System.Drawing.Point(26, 73);
-            this.uiLabel4.Name = "uiLabel4";
-            this.uiLabel4.Size = new System.Drawing.Size(92, 29);
-            this.uiLabel4.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel4.TabIndex = 26;
-            this.uiLabel4.Text = "商品名称：";
-            this.uiLabel4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // txtSellNo
-            // 
-            this.txtSellNo.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.txtSellNo.FillColor = System.Drawing.Color.White;
-            this.txtSellNo.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.txtSellNo.Location = new System.Drawing.Point(107, 30);
-            this.txtSellNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.txtSellNo.Maximum = 2147483647D;
-            this.txtSellNo.Minimum = -2147483648D;
-            this.txtSellNo.MinimumSize = new System.Drawing.Size(1, 1);
-            this.txtSellNo.Name = "txtSellNo";
-            this.txtSellNo.Padding = new System.Windows.Forms.Padding(5);
-            this.txtSellNo.Radius = 20;
-            this.txtSellNo.ReadOnly = true;
-            this.txtSellNo.Size = new System.Drawing.Size(145, 29);
-            this.txtSellNo.Style = Sunny.UI.UIStyle.Custom;
-            this.txtSellNo.TabIndex = 25;
-            this.txtSellNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // uiLabel3
-            // 
-            this.uiLabel3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.uiLabel3.Location = new System.Drawing.Point(26, 29);
-            this.uiLabel3.Name = "uiLabel3";
-            this.uiLabel3.Size = new System.Drawing.Size(92, 29);
-            this.uiLabel3.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel3.TabIndex = 23;
-            this.uiLabel3.Text = "商品编号：";
-            this.uiLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // dgvRoomSell
-            // 
-            this.dgvRoomSell.AllowUserToAddRows = false;
-            this.dgvRoomSell.AllowUserToDeleteRows = false;
-            this.dgvRoomSell.AllowUserToResizeColumns = false;
-            this.dgvRoomSell.AllowUserToResizeRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.dgvRoomSell.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
-            this.dgvRoomSell.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            this.dgvRoomSell.BackgroundColor = System.Drawing.Color.White;
-            this.dgvRoomSell.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvRoomSell.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvRoomSell.ColumnHeadersHeight = 32;
-            this.dgvRoomSell.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvRoomSell.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.clRoomNo,
-            this.clCustoNo,
-            this.clSpendName,
-            this.clSpendAmount,
-            this.clSpendPrice,
-            this.clSpendMoney,
-            this.clSpendTime,
-            this.clSpendNo,
-            this.Column8,
-            this.Column6,
-            this.Column7,
-            this.Column9,
-            this.Column10,
-            this.Column11});
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            dataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvRoomSell.DefaultCellStyle = dataGridViewCellStyle3;
-            this.dgvRoomSell.EnableHeadersVisualStyles = false;
-            this.dgvRoomSell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.dgvRoomSell.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            this.dgvRoomSell.Location = new System.Drawing.Point(496, 218);
-            this.dgvRoomSell.Name = "dgvRoomSell";
-            this.dgvRoomSell.ReadOnly = true;
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 12F);
-            dataGridViewCellStyle4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvRoomSell.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
-            this.dgvRoomSell.RowHeadersVisible = false;
-            dataGridViewCellStyle5.BackColor = System.Drawing.Color.White;
-            this.dgvRoomSell.RowsDefaultCellStyle = dataGridViewCellStyle5;
-            this.dgvRoomSell.RowTemplate.Height = 29;
-            this.dgvRoomSell.SelectedIndex = -1;
-            this.dgvRoomSell.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvRoomSell.ShowRowErrors = false;
-            this.dgvRoomSell.Size = new System.Drawing.Size(573, 269);
-            this.dgvRoomSell.Style = Sunny.UI.UIStyle.Custom;
-            this.dgvRoomSell.TabIndex = 15;
-            // 
-            // clRoomNo
-            // 
-            this.clRoomNo.DataPropertyName = "RoomNo";
-            this.clRoomNo.FillWeight = 102.6831F;
-            this.clRoomNo.HeaderText = "房号";
-            this.clRoomNo.Name = "clRoomNo";
-            this.clRoomNo.ReadOnly = true;
-            // 
-            // clCustoNo
-            // 
-            this.clCustoNo.DataPropertyName = "CustoNo";
-            this.clCustoNo.FillWeight = 102.6831F;
-            this.clCustoNo.HeaderText = "客户编号";
-            this.clCustoNo.Name = "clCustoNo";
-            this.clCustoNo.ReadOnly = true;
-            // 
-            // clSpendName
-            // 
-            this.clSpendName.DataPropertyName = "SpendName";
-            this.clSpendName.FillWeight = 102.6831F;
-            this.clSpendName.HeaderText = "商品";
-            this.clSpendName.Name = "clSpendName";
-            this.clSpendName.ReadOnly = true;
-            // 
-            // clSpendAmount
-            // 
-            this.clSpendAmount.DataPropertyName = "SpendAmount";
-            this.clSpendAmount.FillWeight = 60F;
-            this.clSpendAmount.HeaderText = "数量";
-            this.clSpendAmount.Name = "clSpendAmount";
-            this.clSpendAmount.ReadOnly = true;
-            // 
-            // clSpendPrice
-            // 
-            this.clSpendPrice.DataPropertyName = "SpendPriceStr";
-            this.clSpendPrice.FillWeight = 102.6831F;
-            this.clSpendPrice.HeaderText = "单价";
-            this.clSpendPrice.Name = "clSpendPrice";
-            this.clSpendPrice.ReadOnly = true;
-            // 
-            // clSpendMoney
-            // 
-            this.clSpendMoney.DataPropertyName = "SpendMoneyStr";
-            this.clSpendMoney.FillWeight = 102.6831F;
-            this.clSpendMoney.HeaderText = "总额";
-            this.clSpendMoney.Name = "clSpendMoney";
-            this.clSpendMoney.ReadOnly = true;
-            // 
-            // clSpendTime
-            // 
-            this.clSpendTime.DataPropertyName = "SpendTime";
-            this.clSpendTime.FillWeight = 102.6831F;
-            this.clSpendTime.HeaderText = "消费时间";
-            this.clSpendTime.Name = "clSpendTime";
-            this.clSpendTime.ReadOnly = true;
-            // 
-            // clSpendNo
-            // 
-            this.clSpendNo.DataPropertyName = "delete_mk";
-            this.clSpendNo.HeaderText = "Column1";
-            this.clSpendNo.Name = "clSpendNo";
-            this.clSpendNo.ReadOnly = true;
-            this.clSpendNo.Visible = false;
-            // 
-            // Column8
-            // 
-            this.Column8.DataPropertyName = "MoneyState";
-            this.Column8.HeaderText = "Column8";
-            this.Column8.Name = "Column8";
-            this.Column8.ReadOnly = true;
-            this.Column8.Visible = false;
-            // 
-            // Column6
-            // 
-            this.Column6.DataPropertyName = "datains_usr";
-            this.Column6.HeaderText = "Column6";
-            this.Column6.Name = "Column6";
-            this.Column6.ReadOnly = true;
-            this.Column6.Visible = false;
-            // 
-            // Column7
-            // 
-            this.Column7.DataPropertyName = "datains_date";
-            this.Column7.HeaderText = "Column7";
-            this.Column7.Name = "Column7";
-            this.Column7.ReadOnly = true;
-            this.Column7.Visible = false;
-            // 
-            // Column9
-            // 
-            this.Column9.DataPropertyName = "datachg_usr";
-            this.Column9.HeaderText = "Column9";
-            this.Column9.Name = "Column9";
-            this.Column9.ReadOnly = true;
-            this.Column9.Visible = false;
-            // 
-            // Column10
-            // 
-            this.Column10.DataPropertyName = "datachg_date";
-            this.Column10.HeaderText = "Column10";
-            this.Column10.Name = "Column10";
-            this.Column10.ReadOnly = true;
-            this.Column10.Visible = false;
-            // 
-            // Column11
-            // 
-            this.Column11.DataPropertyName = "SpendStateNm";
-            this.Column11.HeaderText = "Column11";
-            this.Column11.Name = "Column11";
-            this.Column11.ReadOnly = true;
-            this.Column11.Visible = false;
-            // 
-            // dgvSellthing
-            // 
-            this.dgvSellthing.AllowUserToAddRows = false;
-            this.dgvSellthing.AllowUserToDeleteRows = false;
-            this.dgvSellthing.AllowUserToResizeColumns = false;
-            this.dgvSellthing.AllowUserToResizeRows = false;
-            dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.dgvSellthing.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
-            this.dgvSellthing.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            this.dgvSellthing.BackgroundColor = System.Drawing.Color.White;
-            this.dgvSellthing.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F);
-            dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSellthing.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
-            this.dgvSellthing.ColumnHeadersHeight = 32;
-            this.dgvSellthing.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dgvSellthing.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.clSellNo,
-            this.Column1,
-            this.Column2,
-            this.Column3,
-            this.Column4,
-            this.Column5,
-            this.clSellName,
-            this.clSellPrice,
-            this.clFormat,
-            this.clStock});
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 12F);
-            dataGridViewCellStyle8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvSellthing.DefaultCellStyle = dataGridViewCellStyle8;
-            this.dgvSellthing.EnableHeadersVisualStyles = false;
-            this.dgvSellthing.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.dgvSellthing.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            this.dgvSellthing.Location = new System.Drawing.Point(2, 88);
-            this.dgvSellthing.Name = "dgvSellthing";
-            this.dgvSellthing.ReadOnly = true;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            dataGridViewCellStyle9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvSellthing.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
-            this.dgvSellthing.RowHeadersVisible = false;
-            dataGridViewCellStyle10.BackColor = System.Drawing.Color.White;
-            this.dgvSellthing.RowsDefaultCellStyle = dataGridViewCellStyle10;
-            this.dgvSellthing.RowTemplate.Height = 29;
-            this.dgvSellthing.SelectedIndex = -1;
-            this.dgvSellthing.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvSellthing.Size = new System.Drawing.Size(488, 399);
-            this.dgvSellthing.Style = Sunny.UI.UIStyle.Custom;
-            this.dgvSellthing.TabIndex = 16;
-            this.dgvSellthing.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSellthing_CellClick);
-            // 
-            // clSellNo
-            // 
-            this.clSellNo.DataPropertyName = "SellNo";
-            this.clSellNo.HeaderText = "商品编号";
-            this.clSellNo.Name = "clSellNo";
-            this.clSellNo.ReadOnly = true;
-            // 
-            // Column1
-            // 
-            this.Column1.DataPropertyName = "delete_mk";
-            this.Column1.HeaderText = "Column1";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Visible = false;
-            // 
-            // Column2
-            // 
-            this.Column2.DataPropertyName = "datains_usr";
-            this.Column2.HeaderText = "Column2";
-            this.Column2.Name = "Column2";
-            this.Column2.ReadOnly = true;
-            this.Column2.Visible = false;
-            // 
-            // Column3
-            // 
-            this.Column3.DataPropertyName = "datains_date";
-            this.Column3.HeaderText = "Column3";
-            this.Column3.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.Visible = false;
-            // 
-            // Column4
-            // 
-            this.Column4.DataPropertyName = "datachg_usr";
-            this.Column4.HeaderText = "Column4";
-            this.Column4.Name = "Column4";
-            this.Column4.ReadOnly = true;
-            this.Column4.Visible = false;
-            // 
-            // Column5
-            // 
-            this.Column5.DataPropertyName = "datachg_date";
-            this.Column5.HeaderText = "Column5";
-            this.Column5.Name = "Column5";
-            this.Column5.ReadOnly = true;
-            this.Column5.Visible = false;
-            // 
-            // clSellName
-            // 
-            this.clSellName.DataPropertyName = "SellName";
-            this.clSellName.HeaderText = "商品名称";
-            this.clSellName.Name = "clSellName";
-            this.clSellName.ReadOnly = true;
-            // 
-            // clSellPrice
-            // 
-            this.clSellPrice.DataPropertyName = "SellPriceStr";
-            this.clSellPrice.HeaderText = "价格(元)";
-            this.clSellPrice.Name = "clSellPrice";
-            this.clSellPrice.ReadOnly = true;
-            // 
-            // clFormat
-            // 
-            this.clFormat.DataPropertyName = "format";
-            this.clFormat.HeaderText = "规格";
-            this.clFormat.Name = "clFormat";
-            this.clFormat.ReadOnly = true;
-            // 
-            // clStock
-            // 
-            this.clStock.DataPropertyName = "Stock";
-            this.clStock.FillWeight = 60F;
-            this.clStock.HeaderText = "库存";
-            this.clStock.Name = "clStock";
-            this.clStock.ReadOnly = true;
-            // 
-            // btnAdd
-            // 
-            this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.btnAdd.Location = new System.Drawing.Point(496, 88);
-            this.btnAdd.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btnAdd.Name = "btnAdd";
-            this.btnAdd.Radius = 20;
-            this.btnAdd.Size = new System.Drawing.Size(115, 39);
-            this.btnAdd.Style = Sunny.UI.UIStyle.Custom;
-            this.btnAdd.TabIndex = 17;
-            this.btnAdd.Text = "确定添加";
-            this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.btnCancel.Location = new System.Drawing.Point(496, 176);
-            this.btnCancel.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Radius = 20;
-            this.btnCancel.Size = new System.Drawing.Size(115, 35);
-            this.btnCancel.Style = Sunny.UI.UIStyle.Custom;
-            this.btnCancel.TabIndex = 18;
-            this.btnCancel.Text = "撤回添加";
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // btnFind
-            // 
-            this.btnFind.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnFind.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.btnFind.Location = new System.Drawing.Point(414, 49);
-            this.btnFind.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btnFind.Name = "btnFind";
-            this.btnFind.Radius = 20;
-            this.btnFind.Size = new System.Drawing.Size(101, 28);
-            this.btnFind.Style = Sunny.UI.UIStyle.Custom;
-            this.btnFind.TabIndex = 19;
-            this.btnFind.Text = "查     找";
-            this.btnFind.Click += new System.EventHandler(this.btnFind_Click);
-            // 
-            // txtFind
-            // 
-            this.txtFind.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.txtFind.FillColor = System.Drawing.Color.White;
-            this.txtFind.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.txtFind.Location = new System.Drawing.Point(210, 49);
-            this.txtFind.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.txtFind.Maximum = 2147483647D;
-            this.txtFind.Minimum = -2147483648D;
-            this.txtFind.MinimumSize = new System.Drawing.Size(1, 1);
-            this.txtFind.Name = "txtFind";
-            this.txtFind.Padding = new System.Windows.Forms.Padding(5);
-            this.txtFind.Radius = 20;
-            this.txtFind.Size = new System.Drawing.Size(197, 29);
-            this.txtFind.Style = Sunny.UI.UIStyle.Custom;
-            this.txtFind.TabIndex = 20;
-            this.txtFind.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // uiLabel1
-            // 
-            this.uiLabel1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.uiLabel1.Location = new System.Drawing.Point(78, 49);
-            this.uiLabel1.Name = "uiLabel1";
-            this.uiLabel1.Size = new System.Drawing.Size(125, 29);
-            this.uiLabel1.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel1.TabIndex = 21;
-            this.uiLabel1.Text = "要查找的商品：";
-            this.uiLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // uiLabel2
-            // 
-            this.uiLabel2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.uiLabel2.Location = new System.Drawing.Point(544, 48);
-            this.uiLabel2.Name = "uiLabel2";
-            this.uiLabel2.Size = new System.Drawing.Size(92, 29);
-            this.uiLabel2.Style = Sunny.UI.UIStyle.Custom;
-            this.uiLabel2.TabIndex = 22;
-            this.uiLabel2.Text = "消费房号：";
-            this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // txtRoomNo
-            // 
-            this.txtRoomNo.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
-            this.txtRoomNo.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.txtRoomNo.FillColor = System.Drawing.Color.White;
-            this.txtRoomNo.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.txtRoomNo.Location = new System.Drawing.Point(634, 48);
-            this.txtRoomNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.txtRoomNo.Maximum = 2147483647D;
-            this.txtRoomNo.Minimum = -2147483648D;
-            this.txtRoomNo.MinimumSize = new System.Drawing.Size(1, 1);
-            this.txtRoomNo.Name = "txtRoomNo";
-            this.txtRoomNo.Padding = new System.Windows.Forms.Padding(5);
-            this.txtRoomNo.Radius = 20;
-            this.txtRoomNo.Size = new System.Drawing.Size(134, 29);
-            this.txtRoomNo.Style = Sunny.UI.UIStyle.Custom;
-            this.txtRoomNo.TabIndex = 23;
-            this.txtRoomNo.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
-            this.txtRoomNo.Validated += new System.EventHandler(this.txtRoomNo_Validated);
-            this.txtRoomNo.TextChanged += new System.EventHandler(this.txtRoomNo_TextChanged);
-            // 
-            // lblState
-            // 
-            this.lblState.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.lblState.Location = new System.Drawing.Point(864, 49);
-            this.lblState.Name = "lblState";
-            this.lblState.Size = new System.Drawing.Size(130, 29);
-            this.lblState.Style = Sunny.UI.UIStyle.Custom;
-            this.lblState.TabIndex = 24;
-            this.lblState.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.lblState.Visible = false;
-            this.lblState.Click += new System.EventHandler(this.lblState_Click);
-            // 
-            // btnCheck
-            // 
-            this.btnCheck.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnCheck.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.btnCheck.Location = new System.Drawing.Point(775, 49);
-            this.btnCheck.MinimumSize = new System.Drawing.Size(1, 1);
-            this.btnCheck.Name = "btnCheck";
-            this.btnCheck.Radius = 20;
-            this.btnCheck.Size = new System.Drawing.Size(83, 28);
-            this.btnCheck.Style = Sunny.UI.UIStyle.Custom;
-            this.btnCheck.TabIndex = 25;
-            this.btnCheck.Text = "可否消费";
-            this.btnCheck.Click += new System.EventHandler(this.btnCheck_Click);
-            // 
-            // FrmSellThing
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
-            this.ClientSize = new System.Drawing.Size(1072, 490);
-            this.Controls.Add(this.btnCheck);
-            this.Controls.Add(this.lblState);
-            this.Controls.Add(this.txtRoomNo);
-            this.Controls.Add(this.uiLabel2);
-            this.Controls.Add(this.uiLabel1);
-            this.Controls.Add(this.txtFind);
-            this.Controls.Add(this.btnFind);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.btnAdd);
-            this.Controls.Add(this.dgvRoomSell);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.dgvSellthing);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.IsForbidAltF4 = true;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FrmSellThing";
-            this.ShowIcon = true;
-            this.ShowTitleIcon = true;
-            this.Style = Sunny.UI.UIStyle.Custom;
-            this.Text = "商品消费";
-            this.Activated += new System.EventHandler(this.FrmSellThing_Activated);
-            this.Load += new System.EventHandler(this.FrmSellThing_Load);
-            this.groupBox2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvRoomSell)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvSellthing)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private System.Windows.Forms.GroupBox groupBox2;
-        private Sunny.UI.UIDataGridView dgvRoomSell;
-        private Sunny.UI.UIDataGridView dgvSellthing;
-        private Sunny.UI.UIButton btnAdd;
-        private Sunny.UI.UIButton btnCancel;
-        private Sunny.UI.UIButton btnFind;
-        private Sunny.UI.UITextBox txtFind;
-        private Sunny.UI.UITextBox txtPrice;
-        private Sunny.UI.UILabel uiLabel6;
-        private Sunny.UI.UIDoubleUpDown nudNum;
-        private Sunny.UI.UILabel uiLabel5;
-        private Sunny.UI.UITextBox txtSellName;
-        private Sunny.UI.UILabel uiLabel4;
-        private Sunny.UI.UITextBox txtSellNo;
-        private Sunny.UI.UILabel uiLabel3;
-        private Sunny.UI.UILabel uiLabel1;
-        private Sunny.UI.UILabel uiLabel2;
-        private Sunny.UI.UITextBox txtRoomNo;
-        private Sunny.UI.UILabel lblState;
-        private Sunny.UI.UIButton btnCheck;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clRoomNo;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clCustoNo;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendAmount;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendPrice;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendMoney;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendTime;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clSpendNo;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clSellNo;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clSellName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clSellPrice;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clFormat;
-        private System.Windows.Forms.DataGridViewTextBoxColumn clStock;
-    }
-}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.resx b/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.resx
deleted file mode 100644
index 9268c83552a4cb5aa1225a18ac70f93a02d7526b..0000000000000000000000000000000000000000
--- a/EOM.TSHotelManager.FormUI/AppFunction/FrmSellThing.resx
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="clRoomNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clCustoNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clSpendName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clSpendAmount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clSpendPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clSpendMoney.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clSpendTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clSpendNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clSellNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clSellName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clSellPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clFormat.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clStock.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAICAAAAEAGAA4AgAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAAFz
-        UkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAAA7DAAAOwwHHb6hkAAABzUlEQVRYR+2WPyxD
-        URTGG5MYWAy1SCWCRWKRYCqzyWIQgwQJ6VKLwWJHIpHGQEhEYiQiEYmktRjExmYwMWAwVWIovxvntcfT
-        P/e2z5NIX/IN975zvu9755x720ik/tQrIBXI5XJXH76HvdvQCoTYut+AWbPfEYoJhCZA2oNnhvV0KAa0
-        COI9CGelAgehGzCCGLgUA09/ZSCl2tAZugkqMKMMJI0B1vEgYPUxZg6UgRNpy2axk+K412RlQARvZA7e
-        ZD3kKPYtnKq+W4uL4J5iaK+hDR7NtauBhGrDglNy4YYdVBzbThwktqoKZJySCwYWFcesMwd9u/cInJO/
-        7hM9uH3OHBAcqi+I2hAQ30LeAJgCpzLIjza5P2IgGFc9TPgDeBclZhjMgw1wwd6r/7Swf1aVAZl8jy8D
-        0SRYA+fg2eZYEncHVqo2QPKLpVDWVMD0HSTBKOgmt6FqcbkPtoqU9AHyI7AExkAvMY01CZVKhnwE7IA5
-        0A+af0WoTlqpAvQ4Rvl3zXCViyVu2aASn/N7hPO3IgLxYgTE7Kt749hZpMwgdumTYCpRwkDeJDHB/p2D
-        MC3XqhGJlTCwqiqQCqwCHhHkFX9QZFbaAhf/l4SfVRCNgJ8sOisAAAAASUVORK5CYII=
-</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucCustomProgressBar.Designer.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucCustomProgressBar.Designer.cs
deleted file mode 100644
index 10cbb0c5e5d52a46ea95c0c62f2a4b3b5731f2b2..0000000000000000000000000000000000000000
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucCustomProgressBar.Designer.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-namespace EOM.TSHotelManager.FormUI
-{
-    partial class ucCustomProgressBar
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            SuspendLayout();
-            // 
-            // ucCustomProgressBar
-            // 
-            AutoScaleDimensions = new SizeF(7F, 17F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Name = "ucCustomProgressBar";
-            Size = new Size(318, 187);
-            ResumeLayout(false);
-        }
-
-        #endregion
-    }
-}
diff --git a/EOM.TSHotelManager.FormUI/AppUserControls/ucCustomProgressBar.cs b/EOM.TSHotelManager.FormUI/AppUserControls/ucCustomProgressBar.cs
deleted file mode 100644
index 580baf4353e65178f3376b2a95f38b449e09e161..0000000000000000000000000000000000000000
--- a/EOM.TSHotelManager.FormUI/AppUserControls/ucCustomProgressBar.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-namespace EOM.TSHotelManager.FormUI
-{
-    public partial class ucCustomProgressBar : UserControl
-    {
-        private ProgressBar progressBar;
-
-        public ucCustomProgressBar()
-        {
-            InitializeDefaults();
-        }
-
-        private void InitializeDefaults()
-        {
-            this.Width = 300;
-            this.Height = 30;
-            this.MaximumSize = new Size(300, 30);
-
-            progressBar = new ProgressBar
-            {
-                Dock = DockStyle.Fill,
-                Maximum = 100
-            };
-
-            this.Controls.Add(progressBar);
-        }
-
-        // 更新进度
-        public int Value
-        {
-            get => progressBar.Value;
-            set => progressBar.Value = value;
-        }
-
-        // 自定义显示方法
-        public new void Show()
-        {
-            base.Show();
-            progressBar.Visible = true;
-        }
-
-        // 自定义关闭方法
-        public new void Close()
-        {
-            // 用 Dispose 方法表示关闭
-            this.Dispose();
-        }
-
-        // 在父控件中居中显示
-        public void CenterInParent()
-        {
-            if (this.Parent != null)
-            {
-                int x = (this.Parent.ClientSize.Width - this.Width) / 2;
-                int y = (this.Parent.ClientSize.Height - this.Height) / 2;
-                this.Location = new Point(x, y);
-            }
-        }
-    }
-}
diff --git a/README.en.md b/README.en.md
index 280eced76fe1deedad62b6af8b8438e60e01908b..ca7e9a00cb9eebd8eb72219a47f57dd87d8a5684 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1,8 +1,8 @@
 <h1 align="center"><img src="https://foruda.gitee.com/avatar/1677165732744604624/7158691_java-and-net_1677165732.png!avatar100" alt="Organization Logo.png" /></h1>
-<h1 align="center">TopskyHotelManagerSystem</h1>
+<h1 align="center">TopskyHotelManagementSystem</h1>
 <p align="center">
-	<a href='https://gitee.com/java-and-net/TopskyHotelManagerSystem/stargazers'><img src='https://gitee.com/java-and-net/TopskyHotelManagerSystem/badge/star.svg?theme=white' alt='star'></img></a>
-        <a href='https://gitee.com/java-and-net/TopskyHotelManagerSystem/members'><img src='https://gitee.com/java-and-net/TopskyHotelManagerSystem/badge/fork.svg?theme=white' alt='fork'></img></a>
+	<a href='https://gitee.com/java-and-net/TopskyHotelManagementSystem/stargazers'><img src='https://gitee.com/java-and-net/TopskyHotelManagementSystem/badge/star.svg?theme=white' alt='star'></img></a>
+        <a href='https://gitee.com/java-and-net/TopskyHotelManagementSystem/members'><img src='https://gitee.com/java-and-net/TopskyHotelManagementSystem/badge/fork.svg?theme=white' alt='fork'></img></a>
         <a href='https://img.shields.io/badge/license-MIT-000000.svg'><img src="https://img.shields.io/badge/license-MIT-000000.svg" alt=""></img></a>
         <a href='https://img.shields.io/badge/language-C#-red.svg'><img src="https://img.shields.io/badge/language-CSharp-red.svg" alt=""></img></a>
 </p>
@@ -11,6 +11,7 @@
 </div>
 
 
+
 # :exclamation: Important Notice:
 
 **Note: The master branch changes with the v2.x version, which significantly differs from the v1.x version. Those interested in the v1.x version can move to the v1.x branch address**: https://gitee.com/java-and-net/TopskyHotelManagerSystem/tree/v1.x/
diff --git a/README.md b/README.md
index 2423204334dc9126dc025ecb02a36e738bac6387..4f64f6f70859fb4732c68bdba9564a5dd688bd3e 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 <h1 align="center"><img src="https://foruda.gitee.com/avatar/1677165732744604624/7158691_java-and-net_1677165732.png!avatar100" alt="Organization Logo.png" /></h1>
-<h1 align="center">TopskyHotelManagerSystem</h1>
+<h1 align="center">TopskyHotelManagementSystem</h1>
 <p align="center">
-	<a href='https://gitee.com/java-and-net/TopskyHotelManagerSystem/stargazers'><img src='https://gitee.com/java-and-net/TopskyHotelManagerSystem/badge/star.svg?theme=white' alt='star'></img></a>
-        <a href='https://gitee.com/java-and-net/TopskyHotelManagerSystem/members'><img src='https://gitee.com/java-and-net/TopskyHotelManagerSystem/badge/fork.svg?theme=white' alt='fork'></img></a>
+	<a href='https://gitee.com/java-and-net/TopskyHotelManagementSystem/stargazers'><img src='https://gitee.com/java-and-net/TopskyHotelManagementSystem/badge/star.svg?theme=white' alt='star'></img></a>
+        <a href='https://gitee.com/java-and-net/TopskyHotelManagementSystem/members'><img src='https://gitee.com/java-and-net/TopskyHotelManagementSystem/badge/fork.svg?theme=white' alt='fork'></img></a>
         <a href='https://img.shields.io/badge/license-MIT-000000.svg'><img src="https://img.shields.io/badge/license-MIT-000000.svg" alt=""></img></a>
         <a href='https://img.shields.io/badge/language-C#-red.svg'><img src="https://img.shields.io/badge/language-CSharp-red.svg" alt=""></img></a>
 </p>
@@ -12,6 +12,7 @@
 
 
 
+
 #  :exclamation: 重要说明：
 
  **注意：目前master分支随v2.x版本变动而变动，v2.x版本与v1.x版本变动极大，因此想要v1.x版本的可移步至v1.x分支地址** ： https://gitee.com/java-and-net/TopskyHotelManagerSystem/tree/v1.x/ 
@@ -42,7 +43,7 @@
 
 5、针对MySQL和PostgreSQL数据库的说明：
 
-		5.1、本地数据库若为MySQL，请拉取[MySQL专用分支](https://gitee.com/java-and-net/topsky-hotel-manager-system-web-api/tree/MySQL_Version/)。
+		5.1、本地数据库若为MySQL，请拉取[MySQL专用分支](https://gitee.com/java-and-net/topsky-hotel-management-system-web-api/tree/MySQL_Version/)。
 	
 		5.2、本地数据库若为PostgreSQL，则无需进行任何改动，只需要在Common层对HttpHelper里的pgsqlString常量数据库连接字符串进行配置。
 
@@ -70,16 +71,16 @@
 
 #  :open_file_folder: 系统结构：
 ```tree
-EOM.Client.TopSkyHotelManagerSystem
+EOM.Client.TopskyHotelManagementSystem
 ├─ .git
 ├─ .gitignore
-├─ EOM.Client.TopSkyHotelManagerSystem.sln
+├─ EOM.Client.TopskyHotelManagementSystem.sln
 ├─ FodyWeavers.xml
 ├─ LICENSE
 ├─ README.md
-├─ EOM.TSHotelManager.Common
-├─ EOM.TSHotelManager.Common.Core
-├─ EOM.TSHotelManager.FormUI
+├─ EOM.TopskyHotelManagementSystem.Common
+├─ EOM.TopskyHotelManagementSystem.Common.Core
+├─ EOM.TopskyHotelManagementSystem.FormUI
 │    ├─ .gitignore
 │    ├─ App.config
 │    ├─ AppFunction
@@ -141,4 +142,4 @@ EOM.Client.TopSkyHotelManagerSystem
 
 **2、通过可视化管理工具打开：数据库脚本\PostgreSQL版本文件\db_file.sql进行数据表建立和数据导入。**
 
-[![java-and-net/TopskyHotelManagerSystem](https://gitee.com/java-and-net/TopskyHotelManagerSystem/widgets/widget_card.svg?colors=4183c4,ffffff,ffffff,e3e9ed,666666,9b9b9b)](https://gitee.com/java-and-net/TopskyHotelManagerSystem)
\ No newline at end of file
+[![java-and-net/TopskyHotelManagementSystem](https://gitee.com/java-and-net/TopskyHotelManagementSystem/widgets/widget_card.svg?colors=4183c4,ffffff,ffffff,e3e9ed,666666,9b9b9b)](https://gitee.com/java-and-net/TopskyHotelManagerSystem)
\ No newline at end of file
diff --git a/topsky-hotel-manager-system-web-api b/topsky-hotel-manager-system-web-api
deleted file mode 160000
index 80f78a0ded1bb91e68a19acf62647449f59bbaea..0000000000000000000000000000000000000000
--- a/topsky-hotel-manager-system-web-api
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 80f78a0ded1bb91e68a19acf62647449f59bbaea
diff --git "a/\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/PostgreSQL\347\211\210\346\234\254/tshoteldb_table.sql" "b/\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/PostgreSQL\347\211\210\346\234\254/tshoteldb_table.sql"
index 6c8f536eee7bbe72ca8d1b4984c5b1ce91ecb75a..aeb411a3871aff8bbfdec90ee6e61ea88be227b9 100644
--- "a/\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/PostgreSQL\347\211\210\346\234\254/tshoteldb_table.sql"
+++ "b/\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/PostgreSQL\347\211\210\346\234\254/tshoteldb_table.sql"
@@ -1,494 +1,525 @@
-DROP TABLE IF EXISTS "public"."admintype";
-DROP TABLE IF EXISTS "public"."cashinfo";
-DROP TABLE IF EXISTS "public"."customer";
-DROP TABLE IF EXISTS "public"."education";
-DROP TABLE IF EXISTS "public"."fonts";
-DROP TABLE IF EXISTS "public"."member_info";
-DROP TABLE IF EXISTS "public"."nation";
-DROP TABLE IF EXISTS "public"."passporttype";
-DROP TABLE IF EXISTS "public"."room";
-DROP TABLE IF EXISTS "public"."roomtype";
-DROP TABLE IF EXISTS "public"."sellthing";
-DROP TABLE IF EXISTS "public"."sextype";
-DROP TABLE IF EXISTS "public"."usertype";
-DROP TABLE IF EXISTS "public"."workercheck";
-DROP TABLE IF EXISTS "public"."workerpic";
-DROP TABLE IF EXISTS "public"."admininfo";
-DROP TABLE IF EXISTS "public"."applicationversion";
-DROP TABLE IF EXISTS "public"."base";
-DROP TABLE IF EXISTS "public"."cardcodes";
-DROP TABLE IF EXISTS "public"."checkinfo";
-DROP TABLE IF EXISTS "public"."counterrule";
-DROP TABLE IF EXISTS "public"."custospend";
-DROP TABLE IF EXISTS "public"."dept";
-DROP TABLE IF EXISTS "public"."module";
-DROP TABLE IF EXISTS "public"."module_zero";
-DROP TABLE IF EXISTS "public"."nav_bar";
-DROP TABLE IF EXISTS "public"."operationlog";
-DROP TABLE IF EXISTS "public"."position";
-DROP TABLE IF EXISTS "public"."reser";
-DROP TABLE IF EXISTS "public"."roomstate";
-DROP TABLE IF EXISTS "public"."gbtype";
-DROP TABLE IF EXISTS "public"."uploadinfo";
-DROP TABLE IF EXISTS "public"."vip_rule";
-DROP TABLE IF EXISTS "public"."worker";
-DROP TABLE IF EXISTS "public"."workergoodbad";
-DROP TABLE IF EXISTS "public"."workerhistory";
+DROP TABLE IF EXISTS "public"."admintype";
+DROP TABLE IF EXISTS "public"."cashinfo";
+DROP TABLE IF EXISTS "public"."customer";
+DROP TABLE IF EXISTS "public"."education";
+DROP TABLE IF EXISTS "public"."fonts";
+DROP TABLE IF EXISTS "public"."member_info";
+DROP TABLE IF EXISTS "public"."nation";
+DROP TABLE IF EXISTS "public"."passporttype";
+DROP TABLE IF EXISTS "public"."room";
+DROP TABLE IF EXISTS "public"."roomtype";
+DROP TABLE IF EXISTS "public"."sellthing";
+DROP TABLE IF EXISTS "public"."sextype";
+DROP TABLE IF EXISTS "public"."usertype";
+DROP TABLE IF EXISTS "public"."workercheck";
+DROP TABLE IF EXISTS "public"."workerpic";
+DROP TABLE IF EXISTS "public"."admininfo";
+DROP TABLE IF EXISTS "public"."applicationversion";
+DROP TABLE IF EXISTS "public"."base";
+DROP TABLE IF EXISTS "public"."cardcodes";
+DROP TABLE IF EXISTS "public"."checkinfo";
+DROP TABLE IF EXISTS "public"."counterrule";
+DROP TABLE IF EXISTS "public"."custospend";
+DROP TABLE IF EXISTS "public"."dept";
+DROP TABLE IF EXISTS "public"."module";
+DROP TABLE IF EXISTS "public"."module_zero";
+DROP TABLE IF EXISTS "public"."nav_bar";
+DROP TABLE IF EXISTS "public"."operationlog";
+DROP TABLE IF EXISTS "public"."position";
+DROP TABLE IF EXISTS "public"."reser";
+DROP TABLE IF EXISTS "public"."roomstate";
+DROP TABLE IF EXISTS "public"."gbtype";
+DROP TABLE IF EXISTS "public"."uploadinfo";
+DROP TABLE IF EXISTS "public"."vip_rule";
+DROP TABLE IF EXISTS "public"."worker";
+DROP TABLE IF EXISTS "public"."workergoodbad";
+DROP TABLE IF EXISTS "public"."workerhistory";
 DROP TABLE IF EXISTS "public"."wtinfo";
-CREATE TABLE "public"."admintype" ( 
-  "Id" SERIAL,
-  "type_id" VARCHAR NOT NULL,
-  "type_name" VARCHAR NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "admintype_pkey" PRIMARY KEY ("Id")
-);
-CREATE TABLE "public"."cashinfo" ( 
-  "CashNo" VARCHAR NOT NULL,
-  "CashName" VARCHAR NOT NULL,
-  "CashPrice" NUMERIC NOT NULL,
-  "CashClub" VARCHAR NOT NULL,
-  "CashTime" TIMESTAMP NOT NULL,
-  "CashSource" VARCHAR NOT NULL,
-  "CashPerson" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "cashinfo_pkey" PRIMARY KEY ("CashNo")
-);
-CREATE TABLE "public"."customer" ( 
-  "custo_no" VARCHAR NOT NULL DEFAULT ''::character varying ,
-  "custo_name" VARCHAR NULL,
-  "custo_sex" SMALLINT NULL DEFAULT 0 ,
-  "custo_tel" VARCHAR NOT NULL,
-  "passport_type" SMALLINT NOT NULL DEFAULT 0 ,
-  "passport_id" VARCHAR NOT NULL,
-  "custo_address" VARCHAR NULL,
-  "custo_birth" DATE NULL,
-  "custo_type" SMALLINT NOT NULL DEFAULT 0 ,
-  "delete_mk" SMALLINT NOT NULL DEFAULT 0 ,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "customer_pkey" PRIMARY KEY ("custo_no")
-);
-CREATE TABLE "public"."education" ( 
-  "education_no" VARCHAR NOT NULL,
-  "education_name" VARCHAR NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "education_pkey" PRIMARY KEY ("education_no")
-);
-CREATE TABLE "public"."fonts" ( 
-  "FontsId" SERIAL,
-  "FontsMess" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "fonts_pkey" PRIMARY KEY ("FontsId")
-);
-CREATE TABLE "public"."member_info" ( 
-  "member_id" VARCHAR NOT NULL,
-  "member_name" VARCHAR NOT NULL,
-  "member_nick_name" VARCHAR NULL,
-  "member_qq_number" VARCHAR NOT NULL,
-  "member_sex" VARCHAR NULL,
-  "member_qq_age" VARCHAR NULL,
-  "member_join_date" VARCHAR NOT NULL,
-  "member_level_score" VARCHAR NOT NULL,
-  "created_by" VARCHAR NULL,
-  "created_time" TIMESTAMP NULL,
-  "updated_by" VARCHAR NULL,
-  "updated_time" TIMESTAMP NULL,
-  CONSTRAINT "member_info_pkey" PRIMARY KEY ("member_id")
-);
-CREATE TABLE "public"."nation" ( 
-  "nation_no" VARCHAR NOT NULL,
-  "nation_name" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "nation_pkey" PRIMARY KEY ("nation_no", "nation_name")
-);
-CREATE TABLE "public"."passporttype" ( 
-  "PassportId" INTEGER NOT NULL,
-  "PassportName" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "passporttype_pkey" PRIMARY KEY ("PassportId")
-);
-CREATE TABLE "public"."room" ( 
-  "room_no" VARCHAR NOT NULL,
-  "room_type" SMALLINT NOT NULL DEFAULT 0 ,
-  "custo_no" VARCHAR NULL,
-  "check_in_time" DATE NULL,
-  "check_out_time" DATE NULL,
-  "room_state_id" SMALLINT NOT NULL DEFAULT 0 ,
-  "room_rent" NUMERIC NOT NULL DEFAULT 0 ,
-  "room_deposit" NUMERIC NULL DEFAULT 0 ,
-  "room_position" VARCHAR NOT NULL DEFAULT 0 ,
-  "delete_mk" SMALLINT NOT NULL DEFAULT 0 ,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "room_pkey" PRIMARY KEY ("room_no")
-);
-CREATE TABLE "public"."roomtype" ( 
-  "RoomType" INTEGER NOT NULL,
-  "RoomName" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL DEFAULT 0 ,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  "room_rent" NUMERIC NOT NULL DEFAULT 0 ,
-  "room_deposit" NUMERIC NOT NULL DEFAULT 0 ,
-  CONSTRAINT "roomtype_pkey" PRIMARY KEY ("RoomType")
-);
-CREATE TABLE "public"."sellthing" ( 
-  "SellNo" VARCHAR NOT NULL,
-  "SellName" VARCHAR NOT NULL,
-  "SellPrice" NUMERIC NOT NULL,
-  "format" VARCHAR NULL,
-  "Stock" NUMERIC NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "sellthing_pkey" PRIMARY KEY ("SellNo")
-);
-CREATE TABLE "public"."sextype" ( 
-  "sexId" INTEGER NOT NULL,
-  "sexName" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "sextype_pkey" PRIMARY KEY ("sexId")
-);
-CREATE TABLE "public"."usertype" ( 
-  "UserType" INTEGER NOT NULL,
-  "TypeName" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "usertype_pkey" PRIMARY KEY ("UserType")
-);
-CREATE TABLE "public"."workercheck" ( 
-  "Id" SERIAL,
-  "WorkerNo" VARCHAR NULL,
-  "CheckTime" TIMESTAMP NULL,
-  "CheckWay" VARCHAR NULL,
-  "CheckState" INTEGER NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "workercheck_pkey" PRIMARY KEY ("Id")
-);
-CREATE TABLE "public"."workerpic" ( 
-  "Id" SERIAL,
-  "WorkerId" VARCHAR NULL,
-  "Pic" VARCHAR NULL,
-  CONSTRAINT "workerpic_pkey" PRIMARY KEY ("Id")
-);
-CREATE TABLE "public"."admininfo" ( 
-  "Id" SERIAL,
-  "AdminAccount" VARCHAR NOT NULL,
-  "AdminPassword" VARCHAR NULL,
-  "AdminType" VARCHAR NULL,
-  "AdminName" VARCHAR NULL,
-  "IsAdmin" INTEGER NULL,
-  "DeleteMk" INTEGER NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "admininfo_pkey" PRIMARY KEY ("Id", "AdminAccount")
-);
-CREATE TABLE "public"."applicationversion" ( 
-  "base_versionId" SERIAL,
-  "base_version" VARCHAR NOT NULL,
-  CONSTRAINT "applicationversion_pkey" PRIMARY KEY ("base_versionId")
-);
-CREATE TABLE "public"."base" ( 
-  "url_no" SERIAL,
-  "url_addr" VARCHAR NULL,
-  CONSTRAINT "base_pkey" PRIMARY KEY ("url_no")
-);
-CREATE TABLE "public"."cardcodes" ( 
-  "id" SERIAL,
-  "Province" VARCHAR NOT NULL,
-  "City" VARCHAR NULL,
-  "District" VARCHAR NULL,
-  "bm" VARCHAR NULL,
-  CONSTRAINT "cardcodes_pkey" PRIMARY KEY ("id")
-);
-CREATE TABLE "public"."checkinfo" ( 
-  "CheckNo" VARCHAR NOT NULL,
-  "CheckClub" VARCHAR NOT NULL,
-  "CheckProgres" VARCHAR NOT NULL,
-  "CheckCash" VARCHAR NOT NULL,
-  "CheckScore" INTEGER NOT NULL,
-  "CheckPerson" VARCHAR NOT NULL,
-  "CheckAdvice" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "checkinfo_pkey" PRIMARY KEY ("CheckNo")
-);
-CREATE TABLE "public"."counterrule" ( 
-  "rule_id" INTEGER NOT NULL,
-  "rule_name" VARCHAR NULL,
-  "rule_desc" VARCHAR NULL,
-  "now_id" INTEGER NULL,
-  "prefix_name" VARCHAR NULL,
-  "custo_format" VARCHAR NULL,
-  "number_format" VARCHAR NULL,
-  "separating_char" VARCHAR NULL,
-  "datains_usrid" VARCHAR NULL,
-  "datains_time" TIMESTAMP NULL,
-  "datachg_usrid" VARCHAR NULL,
-  "datachg_time" TIMESTAMP NULL,
-  CONSTRAINT "counterrule_pkey" PRIMARY KEY ("rule_id")
-);
-CREATE TABLE "public"."custospend" ( 
-  "SpendId" SERIAL,
-  "RoomNo" VARCHAR NOT NULL,
-  "CustoNo" VARCHAR NOT NULL,
-  "SpendName" VARCHAR NOT NULL,
-  "SpendAmount" INTEGER NOT NULL,
-  "SpendPrice" NUMERIC NOT NULL,
-  "SpendMoney" NUMERIC NOT NULL,
-  "SpendTime" TIMESTAMP NOT NULL,
-  "MoneyState" VARCHAR NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "custospend_pkey" PRIMARY KEY ("SpendId")
-);
-CREATE TABLE "public"."dept" ( 
-  "dept_no" VARCHAR NOT NULL,
-  "dept_name" VARCHAR NULL,
-  "dept_desc" VARCHAR NULL,
-  "dept_date" DATE NULL,
-  "dept_leader" VARCHAR NULL,
-  "dept_parent" VARCHAR NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "dept_pkey" PRIMARY KEY ("dept_no")
-);
-CREATE TABLE "public"."module" ( 
-  "module_id" SERIAL,
-  "module_name" VARCHAR NULL,
-  "module_desc" VARCHAR NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "module_pkey" PRIMARY KEY ("module_id")
-);
-CREATE TABLE "public"."module_zero" ( 
-  "module_id" SERIAL,
-  "admin_account" VARCHAR NULL,
-  "module_name" VARCHAR NULL,
-  "module_enable" INTEGER NULL,
-  CONSTRAINT "module_zero_pkey" PRIMARY KEY ("module_id")
-);
-CREATE TABLE "public"."nav_bar" ( 
-  "nav_id" SERIAL,
-  "nav_name" VARCHAR NOT NULL,
-  "nav_or" INTEGER NULL DEFAULT 0 ,
-  "nav_pic" VARCHAR NULL,
-  "nav_event" VARCHAR NULL,
-  "delete_mk" INTEGER NOT NULL DEFAULT 0 ,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  "margin_left" SMALLINT NULL,
-  CONSTRAINT "nav_bar_pkey" PRIMARY KEY ("nav_id")
-);
-CREATE TABLE "public"."operationlog" ( 
-  "OperationId" SERIAL,
-  "OperationTime" TIMESTAMP NOT NULL,
-  "LogContent" VARCHAR NOT NULL,
-  "OperationAccount" VARCHAR NOT NULL,
-  "OperationLevel" INTEGER NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" TIMESTAMP NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" TIMESTAMP NULL,
-  "SoftwareVersion" VARCHAR NULL,
-  "login_ip" VARCHAR NULL,
-  CONSTRAINT "operationlog_pkey" PRIMARY KEY ("OperationId")
-);
-CREATE TABLE "public"."position" ( 
-  "position_no" VARCHAR NOT NULL,
-  "position_name" VARCHAR NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "position_pkey" PRIMARY KEY ("position_no")
-);
-CREATE TABLE "public"."reser" ( 
-  "ReserId" VARCHAR NOT NULL,
-  "CustoName" VARCHAR NULL,
-  "CustoTel" VARCHAR NULL,
-  "ReserWay" VARCHAR NULL,
-  "ReserRoom" VARCHAR NULL,
-  "ReserDate" DATE NULL,
-  "ReserEndDay" DATE NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "reser_pkey" PRIMARY KEY ("ReserId")
-);
-CREATE TABLE "public"."roomstate" ( 
-  "RoomStateId" INTEGER NOT NULL,
-  "RoomState" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "roomstate_pkey" PRIMARY KEY ("RoomStateId")
-);
-CREATE TABLE "public"."gbtype" ( 
-  "GBTypeId" INTEGER NOT NULL,
-  "GBName" VARCHAR NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "gbtype_pkey" PRIMARY KEY ("GBTypeId")
-);
-CREATE TABLE "public"."uploadinfo" ( 
-  "NoticeNo" VARCHAR NOT NULL,
-  "Noticetheme" VARCHAR NOT NULL,
-  "NoticeType" VARCHAR NULL,
-  "NoticeTime" TIMESTAMP NOT NULL,
-  "NoticeContent" VARCHAR NOT NULL,
-  "NoticeClub" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "uploadinfo_pkey" PRIMARY KEY ("NoticeNo")
-);
-CREATE TABLE "public"."vip_rule" ( 
-  "id" SERIAL,
-  "rule_id" VARCHAR NOT NULL,
-  "rule_name" VARCHAR NOT NULL,
-  "rule_value" NUMERIC NOT NULL,
-  "type_id" INTEGER NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "vip_rule_pkey" PRIMARY KEY ("id", "rule_id")
-);
-CREATE TABLE "public"."worker" ( 
-  "WorkerId" VARCHAR NOT NULL,
-  "WorkerName" VARCHAR NOT NULL,
-  "WorkerBirthday" TIMESTAMP NOT NULL,
-  "WorkerSex" INTEGER NOT NULL,
-  "WorkerTel" VARCHAR NOT NULL,
-  "WorkerClub" VARCHAR NOT NULL,
-  "WorkerNation" VARCHAR NOT NULL,
-  "WorkerAddress" VARCHAR NOT NULL,
-  "WorkerPosition" VARCHAR NOT NULL,
-  "CardID" VARCHAR NOT NULL,
-  "WorkerPwd" VARCHAR NULL,
-  "WorkerTime" TIMESTAMP NOT NULL,
-  "WorkerFace" VARCHAR NOT NULL,
-  "WorkerEducation" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "worker_pkey" PRIMARY KEY ("WorkerId")
-);
-CREATE TABLE "public"."workergoodbad" ( 
-  "Id" SERIAL,
-  "WorkNo" VARCHAR NULL,
-  "GBInfo" VARCHAR NULL,
-  "GBType" INTEGER NULL,
-  "GBOperation" VARCHAR NULL,
-  "GBTime" TIMESTAMP NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "workergoodbad_pkey" PRIMARY KEY ("Id")
-);
-CREATE TABLE "public"."workerhistory" ( 
-  "Id" SERIAL,
-  "WorkerId" VARCHAR NOT NULL,
-  "StartDate" TIMESTAMP NOT NULL,
-  "EndDate" TIMESTAMP NOT NULL,
-  "Position" VARCHAR NOT NULL,
-  "Company" VARCHAR NOT NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  CONSTRAINT "workerhistory_pkey" PRIMARY KEY ("Id")
-);
-CREATE TABLE "public"."wtinfo" ( 
-  "RoomNo" VARCHAR NOT NULL,
-  "UseDate" TIMESTAMP NOT NULL,
-  "EndDate" TIMESTAMP NULL,
-  "WaterUse" NUMERIC NOT NULL,
-  "PowerUse" NUMERIC NOT NULL,
-  "Record" VARCHAR NOT NULL,
-  "CustoNo" VARCHAR NULL,
-  "delete_mk" INTEGER NOT NULL,
-  "datains_usr" VARCHAR NULL,
-  "datains_date" DATE NULL,
-  "datachg_usr" VARCHAR NULL,
-  "datachg_date" DATE NULL,
-  "WtiNo" SERIAL,
-  CONSTRAINT "wtinfo_pkey" PRIMARY KEY ("WtiNo")
-);
+DROP TABLE IF EXISTS "public"."menu";
+CREATE TABLE "public"."admintype" ( 
+  "Id" SERIAL,
+  "type_id" VARCHAR NOT NULL,
+  "type_name" VARCHAR NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "admintype_pkey" PRIMARY KEY ("Id")
+);
+CREATE TABLE "public"."cashinfo" ( 
+  "CashNo" VARCHAR NOT NULL,
+  "CashName" VARCHAR NOT NULL,
+  "CashPrice" NUMERIC NOT NULL,
+  "CashClub" VARCHAR NOT NULL,
+  "CashTime" TIMESTAMP NOT NULL,
+  "CashSource" VARCHAR NOT NULL,
+  "CashPerson" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "cashinfo_pkey" PRIMARY KEY ("CashNo")
+);
+CREATE TABLE "public"."customer" ( 
+  "custo_no" VARCHAR NOT NULL DEFAULT ''::character varying ,
+  "custo_name" VARCHAR NULL,
+  "custo_sex" SMALLINT NULL DEFAULT 0 ,
+  "custo_tel" VARCHAR NOT NULL,
+  "passport_type" SMALLINT NOT NULL DEFAULT 0 ,
+  "passport_id" VARCHAR NOT NULL,
+  "custo_address" VARCHAR NULL,
+  "custo_birth" DATE NULL,
+  "custo_type" SMALLINT NOT NULL DEFAULT 0 ,
+  "delete_mk" SMALLINT NOT NULL DEFAULT 0 ,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "customer_pkey" PRIMARY KEY ("custo_no")
+);
+CREATE TABLE "public"."education" ( 
+  "education_no" VARCHAR NOT NULL,
+  "education_name" VARCHAR NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "education_pkey" PRIMARY KEY ("education_no")
+);
+CREATE TABLE "public"."fonts" ( 
+  "FontsId" SERIAL,
+  "FontsMess" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "fonts_pkey" PRIMARY KEY ("FontsId")
+);
+CREATE TABLE "public"."member_info" ( 
+  "member_id" VARCHAR NOT NULL,
+  "member_name" VARCHAR NOT NULL,
+  "member_nick_name" VARCHAR NULL,
+  "member_qq_number" VARCHAR NOT NULL,
+  "member_sex" VARCHAR NULL,
+  "member_qq_age" VARCHAR NULL,
+  "member_join_date" VARCHAR NOT NULL,
+  "member_level_score" VARCHAR NOT NULL,
+  "created_by" VARCHAR NULL,
+  "created_time" TIMESTAMP NULL,
+  "updated_by" VARCHAR NULL,
+  "updated_time" TIMESTAMP NULL,
+  CONSTRAINT "member_info_pkey" PRIMARY KEY ("member_id")
+);
+CREATE TABLE "public"."nation" ( 
+  "nation_no" VARCHAR NOT NULL,
+  "nation_name" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "nation_pkey" PRIMARY KEY ("nation_no", "nation_name")
+);
+CREATE TABLE "public"."passporttype" ( 
+  "PassportId" INTEGER NOT NULL,
+  "PassportName" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "passporttype_pkey" PRIMARY KEY ("PassportId")
+);
+CREATE TABLE "public"."room" ( 
+  "room_no" VARCHAR NOT NULL,
+  "room_type" SMALLINT NOT NULL DEFAULT 0 ,
+  "custo_no" VARCHAR NULL,
+  "check_in_time" DATE NULL,
+  "check_out_time" DATE NULL,
+  "room_state_id" SMALLINT NOT NULL DEFAULT 0 ,
+  "room_rent" NUMERIC NOT NULL DEFAULT 0 ,
+  "room_deposit" NUMERIC NULL DEFAULT 0 ,
+  "room_position" VARCHAR NOT NULL DEFAULT 0 ,
+  "delete_mk" SMALLINT NOT NULL DEFAULT 0 ,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "room_pkey" PRIMARY KEY ("room_no")
+);
+CREATE TABLE "public"."roomtype" ( 
+  "RoomType" INTEGER NOT NULL,
+  "RoomName" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL DEFAULT 0 ,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  "room_rent" NUMERIC NOT NULL DEFAULT 0 ,
+  "room_deposit" NUMERIC NOT NULL DEFAULT 0 ,
+  CONSTRAINT "roomtype_pkey" PRIMARY KEY ("RoomType")
+);
+CREATE TABLE "public"."sellthing" ( 
+  "SellNo" VARCHAR NOT NULL,
+  "SellName" VARCHAR NOT NULL,
+  "SellPrice" NUMERIC NOT NULL,
+  "format" VARCHAR NULL,
+  "Stock" NUMERIC NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "sellthing_pkey" PRIMARY KEY ("SellNo")
+);
+CREATE TABLE "public"."sextype" ( 
+  "sexId" INTEGER NOT NULL,
+  "sexName" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "sextype_pkey" PRIMARY KEY ("sexId")
+);
+CREATE TABLE "public"."usertype" ( 
+  "UserType" INTEGER NOT NULL,
+  "TypeName" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "usertype_pkey" PRIMARY KEY ("UserType")
+);
+CREATE TABLE "public"."workercheck" ( 
+  "Id" SERIAL,
+  "WorkerNo" VARCHAR NULL,
+  "CheckTime" TIMESTAMP NULL,
+  "CheckWay" VARCHAR NULL,
+  "CheckState" INTEGER NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "workercheck_pkey" PRIMARY KEY ("Id")
+);
+CREATE TABLE "public"."workerpic" ( 
+  "Id" SERIAL,
+  "WorkerId" VARCHAR NULL,
+  "Pic" VARCHAR NULL,
+  CONSTRAINT "workerpic_pkey" PRIMARY KEY ("Id")
+);
+CREATE TABLE "public"."admininfo" ( 
+  "Id" SERIAL,
+  "AdminAccount" VARCHAR NOT NULL,
+  "AdminPassword" VARCHAR NULL,
+  "AdminType" VARCHAR NULL,
+  "AdminName" VARCHAR NULL,
+  "IsAdmin" INTEGER NULL,
+  "DeleteMk" INTEGER NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "admininfo_pkey" PRIMARY KEY ("Id", "AdminAccount")
+);
+CREATE TABLE "public"."applicationversion" ( 
+  "base_versionId" SERIAL,
+  "base_version" VARCHAR NOT NULL,
+  CONSTRAINT "applicationversion_pkey" PRIMARY KEY ("base_versionId")
+);
+CREATE TABLE "public"."base" ( 
+  "url_no" SERIAL,
+  "url_addr" VARCHAR NULL,
+  CONSTRAINT "base_pkey" PRIMARY KEY ("url_no")
+);
+CREATE TABLE "public"."cardcodes" ( 
+  "id" SERIAL,
+  "Province" VARCHAR NOT NULL,
+  "City" VARCHAR NULL,
+  "District" VARCHAR NULL,
+  "bm" VARCHAR NULL,
+  CONSTRAINT "cardcodes_pkey" PRIMARY KEY ("id")
+);
+CREATE TABLE "public"."checkinfo" ( 
+  "CheckNo" VARCHAR NOT NULL,
+  "CheckClub" VARCHAR NOT NULL,
+  "CheckProgres" VARCHAR NOT NULL,
+  "CheckCash" VARCHAR NOT NULL,
+  "CheckScore" INTEGER NOT NULL,
+  "CheckPerson" VARCHAR NOT NULL,
+  "CheckAdvice" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "checkinfo_pkey" PRIMARY KEY ("CheckNo")
+);
+CREATE TABLE "public"."counterrule" ( 
+  "rule_id" INTEGER NOT NULL,
+  "rule_name" VARCHAR NULL,
+  "rule_desc" VARCHAR NULL,
+  "now_id" INTEGER NULL,
+  "prefix_name" VARCHAR NULL,
+  "custo_format" VARCHAR NULL,
+  "number_format" VARCHAR NULL,
+  "separating_char" VARCHAR NULL,
+  "datains_usrid" VARCHAR NULL,
+  "datains_time" TIMESTAMP NULL,
+  "datachg_usrid" VARCHAR NULL,
+  "datachg_time" TIMESTAMP NULL,
+  CONSTRAINT "counterrule_pkey" PRIMARY KEY ("rule_id")
+);
+CREATE TABLE "public"."custospend" ( 
+  "SpendId" SERIAL,
+  "RoomNo" VARCHAR NOT NULL,
+  "CustoNo" VARCHAR NOT NULL,
+  "SpendName" VARCHAR NOT NULL,
+  "SpendAmount" INTEGER NOT NULL,
+  "SpendPrice" NUMERIC NOT NULL,
+  "SpendMoney" NUMERIC NOT NULL,
+  "SpendTime" TIMESTAMP NOT NULL,
+  "MoneyState" VARCHAR NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "custospend_pkey" PRIMARY KEY ("SpendId")
+);
+CREATE TABLE "public"."dept" ( 
+  "dept_no" VARCHAR NOT NULL,
+  "dept_name" VARCHAR NULL,
+  "dept_desc" VARCHAR NULL,
+  "dept_date" DATE NULL,
+  "dept_leader" VARCHAR NULL,
+  "dept_parent" VARCHAR NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "dept_pkey" PRIMARY KEY ("dept_no")
+);
+CREATE TABLE "public"."module" ( 
+  "module_id" SERIAL,
+  "module_name" VARCHAR NULL,
+  "module_desc" VARCHAR NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "module_pkey" PRIMARY KEY ("module_id")
+);
+CREATE TABLE "public"."module_zero" ( 
+  "module_id" SERIAL,
+  "admin_account" VARCHAR NULL,
+  "module_name" VARCHAR NULL,
+  "module_enable" INTEGER NULL,
+  CONSTRAINT "module_zero_pkey" PRIMARY KEY ("module_id")
+);
+CREATE TABLE "public"."nav_bar" ( 
+  "nav_id" SERIAL,
+  "nav_name" VARCHAR NOT NULL,
+  "nav_or" INTEGER NULL DEFAULT 0 ,
+  "nav_pic" VARCHAR NULL,
+  "nav_event" VARCHAR NULL,
+  "delete_mk" INTEGER NOT NULL DEFAULT 0 ,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  "margin_left" SMALLINT NULL,
+  CONSTRAINT "nav_bar_pkey" PRIMARY KEY ("nav_id")
+);
+CREATE TABLE "public"."operationlog" ( 
+  "OperationId" SERIAL,
+  "OperationTime" TIMESTAMP NOT NULL,
+  "LogContent" VARCHAR NOT NULL,
+  "OperationAccount" VARCHAR NOT NULL,
+  "OperationLevel" INTEGER NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" TIMESTAMP NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" TIMESTAMP NULL,
+  "SoftwareVersion" VARCHAR NULL,
+  "login_ip" VARCHAR NULL,
+  CONSTRAINT "operationlog_pkey" PRIMARY KEY ("OperationId")
+);
+CREATE TABLE "public"."position" ( 
+  "position_no" VARCHAR NOT NULL,
+  "position_name" VARCHAR NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "position_pkey" PRIMARY KEY ("position_no")
+);
+CREATE TABLE "public"."reser" ( 
+  "ReserId" VARCHAR NOT NULL,
+  "CustoName" VARCHAR NULL,
+  "CustoTel" VARCHAR NULL,
+  "ReserWay" VARCHAR NULL,
+  "ReserRoom" VARCHAR NULL,
+  "ReserDate" DATE NULL,
+  "ReserEndDay" DATE NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "reser_pkey" PRIMARY KEY ("ReserId")
+);
+CREATE TABLE "public"."roomstate" ( 
+  "RoomStateId" INTEGER NOT NULL,
+  "RoomState" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "roomstate_pkey" PRIMARY KEY ("RoomStateId")
+);
+CREATE TABLE "public"."gbtype" ( 
+  "GBTypeId" INTEGER NOT NULL,
+  "GBName" VARCHAR NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "gbtype_pkey" PRIMARY KEY ("GBTypeId")
+);
+CREATE TABLE "public"."uploadinfo" ( 
+  "NoticeNo" VARCHAR NOT NULL,
+  "Noticetheme" VARCHAR NOT NULL,
+  "NoticeType" VARCHAR NULL,
+  "NoticeTime" TIMESTAMP NOT NULL,
+  "NoticeContent" VARCHAR NOT NULL,
+  "NoticeClub" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "uploadinfo_pkey" PRIMARY KEY ("NoticeNo")
+);
+CREATE TABLE "public"."vip_rule" ( 
+  "id" SERIAL,
+  "rule_id" VARCHAR NOT NULL,
+  "rule_name" VARCHAR NOT NULL,
+  "rule_value" NUMERIC NOT NULL,
+  "type_id" INTEGER NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "vip_rule_pkey" PRIMARY KEY ("id", "rule_id")
+);
+CREATE TABLE "public"."worker" ( 
+  "WorkerId" VARCHAR NOT NULL,
+  "WorkerName" VARCHAR NOT NULL,
+  "WorkerBirthday" TIMESTAMP NOT NULL,
+  "WorkerSex" INTEGER NOT NULL,
+  "WorkerTel" VARCHAR NOT NULL,
+  "WorkerClub" VARCHAR NOT NULL,
+  "WorkerNation" VARCHAR NOT NULL,
+  "WorkerAddress" VARCHAR NOT NULL,
+  "WorkerPosition" VARCHAR NOT NULL,
+  "CardID" VARCHAR NOT NULL,
+  "WorkerPwd" VARCHAR NULL,
+  "WorkerTime" TIMESTAMP NOT NULL,
+  "WorkerFace" VARCHAR NOT NULL,
+  "WorkerEducation" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "worker_pkey" PRIMARY KEY ("WorkerId")
+);
+CREATE TABLE "public"."workergoodbad" ( 
+  "Id" SERIAL,
+  "WorkNo" VARCHAR NULL,
+  "GBInfo" VARCHAR NULL,
+  "GBType" INTEGER NULL,
+  "GBOperation" VARCHAR NULL,
+  "GBTime" TIMESTAMP NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "workergoodbad_pkey" PRIMARY KEY ("Id")
+);
+CREATE TABLE "public"."workerhistory" ( 
+  "Id" SERIAL,
+  "WorkerId" VARCHAR NOT NULL,
+  "StartDate" TIMESTAMP NOT NULL,
+  "EndDate" TIMESTAMP NOT NULL,
+  "Position" VARCHAR NOT NULL,
+  "Company" VARCHAR NOT NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  CONSTRAINT "workerhistory_pkey" PRIMARY KEY ("Id")
+);
+CREATE TABLE "public"."wtinfo" ( 
+  "RoomNo" VARCHAR NOT NULL,
+  "UseDate" TIMESTAMP NOT NULL,
+  "EndDate" TIMESTAMP NULL,
+  "WaterUse" NUMERIC NOT NULL,
+  "PowerUse" NUMERIC NOT NULL,
+  "Record" VARCHAR NOT NULL,
+  "CustoNo" VARCHAR NULL,
+  "delete_mk" INTEGER NOT NULL,
+  "datains_usr" VARCHAR NULL,
+  "datains_date" DATE NULL,
+  "datachg_usr" VARCHAR NULL,
+  "datachg_date" DATE NULL,
+  "WtiNo" SERIAL,
+  CONSTRAINT "wtinfo_pkey" PRIMARY KEY ("WtiNo")
+);
+CREATE TABLE "public"."menu" (
+  "id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 2147483647
+START 1
+CACHE 1
+),
+  "key" varchar(100) COLLATE "pg_catalog"."default",
+  "title" text COLLATE "pg_catalog"."default" NOT NULL,
+  "path" text COLLATE "pg_catalog"."default",
+  "parent" int4,
+  "delete_mk" int4,
+  "datains_usr" varchar(100) COLLATE "pg_catalog"."default",
+  "datains_date" date,
+  "datachg_usr" varchar(100) COLLATE "pg_catalog"."default",
+  "datachg_date" date
+);
+COMMENT ON COLUMN "public"."menu"."id" IS '自增长ID';
+COMMENT ON COLUMN "public"."menu"."key" IS '菜单键';
+COMMENT ON COLUMN "public"."menu"."title" IS '菜单标题';
+COMMENT ON COLUMN "public"."menu"."path" IS '菜单路径';
+COMMENT ON COLUMN "public"."menu"."parent" IS '父级ID';
+COMMENT ON COLUMN "public"."menu"."delete_mk" IS '删除标记';
+COMMENT ON COLUMN "public"."menu"."datains_usr" IS '资料创建人';
+COMMENT ON COLUMN "public"."menu"."datains_date" IS '资料创建时间';
+COMMENT ON COLUMN "public"."menu"."datachg_usr" IS '资料更新人';
+COMMENT ON COLUMN "public"."menu"."datachg_date" IS '资料更新时间';
+COMMENT ON TABLE "public"."menu" IS '菜单表';
+ALTER TABLE "public"."menu" ADD CONSTRAINT "menu_pkey" PRIMARY KEY ("id");
\ No newline at end of file