diff --git a/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs b/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs
index 78658331850f5d3c35d537833f910fa87435ec45..816603da34234710f78957756aa7b5a7940a29fd 100644
--- a/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs
+++ b/EOM.TSHotelManager.Application/Business/Customer/CustoService.cs
@@ -170,9 +170,9 @@ namespace EOM.TSHotelManager.Application
         /// 查询所有客户信息
         /// </summary>
         /// <returns></returns>
-        public OSelectCustoAllDto SelectCustoAll(int? pageIndex, int? pageSize, bool onlyVip = false)
+        public OSelectAllDto<Custo> SelectCustoAll(int? pageIndex, int? pageSize, bool onlyVip = false)
         {
-            OSelectCustoAllDto oSelectCustoAllDto = new OSelectCustoAllDto();
+            OSelectAllDto<Custo> oSelectCustoAllDto = new OSelectAllDto<Custo>();
 
             //查询出所有性别类型
             List<SexType> sexTypes = new List<SexType>();
diff --git a/EOM.TSHotelManager.Application/Business/Customer/ICustoService.cs b/EOM.TSHotelManager.Application/Business/Customer/ICustoService.cs
index cc83e3a0fa2a302c958de709e2291ca643e4bbf8..154d2fe69a0054403ef21e212bdf909dc961c389 100644
--- a/EOM.TSHotelManager.Application/Business/Customer/ICustoService.cs
+++ b/EOM.TSHotelManager.Application/Business/Customer/ICustoService.cs
@@ -62,7 +62,7 @@ namespace EOM.TSHotelManager.Application
         /// 查询所有客户信息
         /// </summary>
         /// <returns></returns>
-        OSelectCustoAllDto SelectCustoAll(int? pageIndex, int? pageSize, bool onlyVip = false);
+        OSelectAllDto<Custo> SelectCustoAll(int? pageIndex, int? pageSize, bool onlyVip = false);
 
         /// <summary>
         /// 查询指定客户信息
diff --git a/EOM.TSHotelManager.Application/Business/Customer/SelectCustoAll.cs b/EOM.TSHotelManager.Application/Business/Customer/SelectCustoAll.cs
deleted file mode 100644
index d5ec9e67bf531ad694bd156d1da5fd32b82293d2..0000000000000000000000000000000000000000
--- a/EOM.TSHotelManager.Application/Business/Customer/SelectCustoAll.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * MIT License
- *Copyright (c) 2021 易开元(Easy-Open-Meta)
-
- *Permission is hereby granted, free of charge, to any person obtaining a copy
- *of this software and associated documentation files (the "Software"), to deal
- *in the Software without restriction, including without limitation the rights
- *to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *copies of the Software, and to permit persons to whom the Software is
- *furnished to do so, subject to the following conditions:
-
- *The above copyright notice and this permission notice shall be included in all
- *copies or substantial portions of the Software.
-
- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *SOFTWARE.
- *
- */
-namespace EOM.TSHotelManager.Application
-{
-    /// <summary>
-    /// 查询所有客户信息
-    /// 输入DTO
-    /// </summary>
-    public class SelectCustoAll
-    {
-        /// <summary>
-        /// 当前页数
-        /// </summary>
-        public int pageIndex { get; set; }
-        /// <summary>
-        /// 当前页总数
-        /// </summary>
-        public int pageSize { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Application/Business/Room/IRoomTypeService.cs b/EOM.TSHotelManager.Application/Business/Room/IRoomTypeService.cs
index a68444c65f77261a15056b66def3bf556518789d..4725db5c494619aa67361395efa4b6ff7a6c52e1 100644
--- a/EOM.TSHotelManager.Application/Business/Room/IRoomTypeService.cs
+++ b/EOM.TSHotelManager.Application/Business/Room/IRoomTypeService.cs
@@ -34,7 +34,7 @@ namespace EOM.TSHotelManager.Application
         /// 获取所有房间类型
         /// </summary>
         /// <returns></returns>
-        List<RoomType> SelectRoomTypesAll();
+        List<RoomType> SelectRoomTypesAll(int? isDelete);
 
         /// <summary>
         /// 根据房间编号查询房间类型名称
@@ -42,5 +42,33 @@ namespace EOM.TSHotelManager.Application
         /// <param name="no"></param>
         /// <returns></returns>
         RoomType SelectRoomTypeByRoomNo(string no);
+
+        /// <summary>
+        /// 根据房间类型查询类型配置
+        /// </summary>
+        /// <param name="roomTypeId"></param>
+        /// <returns></returns>
+        RoomType SelectRoomTypeByType(int roomTypeId);
+
+        /// <summary>
+        /// 添加房间状态
+        /// </summary>
+        /// <param name="roomType"></param>
+        /// <returns></returns>
+        bool InsertRoomType(RoomType roomType);
+
+        /// <summary>
+        /// 更新房间状态
+        /// </summary>
+        /// <param name="roomType"></param>
+        /// <returns></returns>
+        bool UpdateRoomType(RoomType roomType);
+
+        /// <summary>
+        /// 删除房间状态
+        /// </summary>
+        /// <param name="roomType"></param>
+        /// <returns></returns>
+        bool DeleteRoomType(RoomType roomType);
     }
 }
\ No newline at end of file
diff --git a/EOM.TSHotelManager.Application/Business/Room/RoomService.cs b/EOM.TSHotelManager.Application/Business/Room/RoomService.cs
index 6dc7d3d4aa5ba5cd08688d9139e38b19a66e8307..a400f390e72b32960c433e74f080664fcd434e86 100644
--- a/EOM.TSHotelManager.Application/Business/Room/RoomService.cs
+++ b/EOM.TSHotelManager.Application/Business/Room/RoomService.cs
@@ -100,9 +100,9 @@ namespace EOM.TSHotelManager.Application
         public List<Room> SelectCanUseRoomAll()
         {
             List<RoomState> roomStates = new List<RoomState>();
-            roomStates = roomStateRepository.GetList(a => a.delete_mk != 1);
+            roomStates = roomStateRepository.GetList();
             List<RoomType> roomTypes = new List<RoomType>();
-            roomTypes = roomTypeRepository.GetList(a => a.delete_mk != 1);
+            roomTypes = roomTypeRepository.GetList();
             List<Room> rooms = new List<Room>();
             rooms = roomRepository.GetList(a => a.delete_mk != 1 && a.RoomStateId == 0).OrderBy(a => a.RoomNo).ToList();
             rooms.ForEach(source =>
@@ -124,11 +124,11 @@ namespace EOM.TSHotelManager.Application
         public List<Room> SelectRoomAll()
         {
             List<RoomState> roomStates = new List<RoomState>();
-            roomStates = roomStateRepository.GetList(a => a.delete_mk != 1);
+            roomStates = roomStateRepository.GetList();
             List<RoomType> roomTypes = new List<RoomType>();
-            roomTypes = roomTypeRepository.GetList(a => a.delete_mk != 1);
+            roomTypes = roomTypeRepository.GetList();
             List<Room> rooms = new List<Room>();
-            rooms = roomRepository.GetList(a => a.delete_mk != 1).OrderBy(a => a.RoomNo).ToList();
+            rooms = roomRepository.GetList().OrderBy(a => a.RoomNo).ToList();
             var listCustoNo = rooms.Select(a => a.CustoNo).Distinct().ToList();
             List<Custo> custos = new List<Custo>();
             custos = custoRepository.GetList(a => listCustoNo.Contains(a.CustoNo));
@@ -195,10 +195,18 @@ namespace EOM.TSHotelManager.Application
             roomStates = roomStateRepository.GetList(a => a.delete_mk != 1);
             Room room = new Room();
             room = roomRepository.GetSingle(a => a.delete_mk != 1 && a.RoomNo == no);
-            var roomSate = roomStates.FirstOrDefault(a => a.RoomStateId == room.RoomStateId);
-            room.RoomState = string.IsNullOrEmpty(roomSate.RoomStateName) ? "" : roomSate.RoomStateName;
-            var roomType = roomTypeRepository.GetSingle(a => a.Roomtype == room.RoomType);
-            room.RoomName = string.IsNullOrEmpty(roomType.RoomName) ? "" : roomType.RoomName;
+            if (!room.IsNullOrEmpty())
+            {
+                var roomSate = roomStates.FirstOrDefault(a => a.RoomStateId == room.RoomStateId);
+                room.RoomState = string.IsNullOrEmpty(roomSate.RoomStateName) ? "" : roomSate.RoomStateName;
+                var roomType = roomTypeRepository.GetSingle(a => a.Roomtype == room.RoomType);
+                room.RoomName = string.IsNullOrEmpty(roomType.RoomName) ? "" : roomType.RoomName;
+            }
+            else
+            {
+                room = new Room();
+            }
+            
             return room;
         }
         #endregion
diff --git a/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs b/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs
index 5a5520893a2d7687553c1a13fe840e1f0a2b66f2..d57afc08d8985481375cc9e7ec3ca28d50889cd2 100644
--- a/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs
+++ b/EOM.TSHotelManager.Application/Business/Room/RoomTypeService.cs
@@ -21,6 +21,7 @@
  *SOFTWARE.
  *
  */
+using CK.Common;
 using EOM.TSHotelManager.Common.Core;
 using EOM.TSHotelManager.EntityFramework;
 
@@ -57,10 +58,19 @@ namespace EOM.TSHotelManager.Application
         /// 获取所有房间类型
         /// </summary>
         /// <returns></returns>
-        public List<RoomType> SelectRoomTypesAll()
+        public List<RoomType> SelectRoomTypesAll(int? isDelete)
         {
             List<RoomType> types = new List<RoomType>();
-            types = roomTypeRepository.GetList(a => a.delete_mk != 1);
+            if (!isDelete.IsNullOrEmpty())
+            {
+                types = roomTypeRepository.GetList(a => a.delete_mk == isDelete);
+                
+            }
+            types = roomTypeRepository.GetList();
+            types.ForEach(t => 
+            {
+                t.DeleteMkNm = t.delete_mk == 0 ? "否" : "是";
+            });
             return types;
         }
         #endregion
@@ -80,5 +90,57 @@ namespace EOM.TSHotelManager.Application
             return roomtype;
         }
         #endregion
+
+        /// <summary>
+        /// 根据房间类型查询类型配置
+        /// </summary>
+        /// <param name="roomTypeId"></param>
+        /// <returns></returns>
+        public RoomType SelectRoomTypeByType(int roomTypeId)
+        {
+            var roomType = roomTypeRepository.GetSingle(a => a.Roomtype == roomTypeId);
+            return roomType;
+        }
+
+        /// <summary>
+        /// 添加房间状态
+        /// </summary>
+        /// <param name="roomType"></param>
+        /// <returns></returns>
+        public bool InsertRoomType(RoomType roomType)
+        {
+            return roomTypeRepository.Insert(roomType);
+        }
+
+        /// <summary>
+        /// 更新房间状态
+        /// </summary>
+        /// <param name="roomType"></param>
+        /// <returns></returns>
+        public bool UpdateRoomType(RoomType roomType)
+        {
+            return roomTypeRepository.Update(a => new RoomType
+            {
+                RoomName = roomType.RoomName,
+                RoomRent = roomType.RoomRent,
+                RoomDeposit = roomType.RoomDeposit,
+                delete_mk = roomType.delete_mk,
+                datachg_usr = roomType.datachg_usr,
+                datachg_date = DateTime.Now
+            }, a => a.Roomtype == roomType.Roomtype) ;
+        }
+
+        /// <summary>
+        /// 删除房间状态
+        /// </summary>
+        /// <param name="roomType"></param>
+        /// <returns></returns>
+        public bool DeleteRoomType(RoomType roomType)
+        {
+            return roomTypeRepository.Update(a => new RoomType
+            {
+                delete_mk = 1
+            }, a => a.Roomtype == roomType.Roomtype);
+        }
     }
 }
diff --git a/EOM.TSHotelManager.Application/Util/IUtilService.cs b/EOM.TSHotelManager.Application/Util/IUtilService.cs
index ad793a712d039bb77961984ae97acbb6425ef74f..7e3e8e0ab590d6ee7ca5246a55d535af017a7d49 100644
--- a/EOM.TSHotelManager.Application/Util/IUtilService.cs
+++ b/EOM.TSHotelManager.Application/Util/IUtilService.cs
@@ -31,6 +31,6 @@ namespace EOM.TSHotelManager.Application
         /// 查询所有操作日志
         /// </summary>
         /// <returns></returns>
-        List<OperationLog> SelectOperationlogAll();
+        OSelectAllDto<OperationLog> SelectOperationlogAll(int? pageIndex, int? pageSize);
     }
 }
diff --git a/EOM.TSHotelManager.Application/Util/UtilService.cs b/EOM.TSHotelManager.Application/Util/UtilService.cs
index ff4a6afd16969cad05e5997944686435cbd39b5c..2b1996e365d60125047075a9ea4e1245786af2a4 100644
--- a/EOM.TSHotelManager.Application/Util/UtilService.cs
+++ b/EOM.TSHotelManager.Application/Util/UtilService.cs
@@ -73,14 +73,25 @@ namespace EOM.TSHotelManager.Application
         /// 查询所有操作日志
         /// </summary>
         /// <returns></returns>
-        public List<OperationLog> SelectOperationlogAll()
+        public OSelectAllDto<OperationLog> SelectOperationlogAll(int? pageIndex, int? pageSize)
         {
-            List<OperationLog> operationLogs = new List<OperationLog>();
-            operationLogs = operationLogRepository.GetList(a => a.delete_mk != 1).OrderByDescending(a => a.OperationTime).ToList();
-            operationLogs.ForEach(source =>
+            OSelectAllDto<OperationLog> operationLogs = new OSelectAllDto<OperationLog>();
+            var count = 0;
+            if (pageIndex != 0 && pageSize != 0)
+            {
+                operationLogs.listSource = operationLogRepository.AsQueryable().OrderByDescending(a => a.OperationTime).ToPageList((int)pageIndex, (int)pageSize, ref count);
+            }
+            else
+            {
+                operationLogs.listSource = operationLogRepository.AsQueryable().OrderByDescending(a => a.OperationTime).ToList();
+            }
+
+            operationLogs.listSource.ForEach(source =>
             {
                 source.OperationLevelNm = source.OperationLevel == RecordLevel.Normal ? "常规操作" : source.OperationLevel == RecordLevel.Warning ? "敏感操作" : "严重操作";
             });
+            operationLogs.total = count;
+
             return operationLogs;
         }
 
diff --git a/EOM.TSHotelManager.Application/Worker/Picture/WorkerPicService.cs b/EOM.TSHotelManager.Application/Worker/Picture/WorkerPicService.cs
index fbef80b1605342f9ff0d3226a8a83fc3d3521f0f..ef0ba754e8fbfe86496a1cb5e8855a28a9c25fa2 100644
--- a/EOM.TSHotelManager.Application/Worker/Picture/WorkerPicService.cs
+++ b/EOM.TSHotelManager.Application/Worker/Picture/WorkerPicService.cs
@@ -1,4 +1,5 @@
-using EOM.TSHotelManager.Common.Core;
+using CK.Common;
+using EOM.TSHotelManager.Common.Core;
 using EOM.TSHotelManager.EntityFramework;
 
 namespace EOM.TSHotelManager.Application
@@ -40,7 +41,10 @@ namespace EOM.TSHotelManager.Application
 
             workerPicSource = workerPicRepository.GetSingle(a => a.WorkerId.Equals(workerPic.WorkerId));
 
-            //workerPicSource.Pic = workerPicSource == null || string.IsNullOrEmpty(workerPicSource.Pic)  "" : workerPicSource.Pic;
+            if (workerPicSource.IsNullOrEmpty())
+            {
+                return new WorkerPic { Id = 0, Pic = "", WorkerId = workerPic.WorkerId };
+            }
 
             return workerPicSource;
         }
diff --git a/EOM.TSHotelManager.Common.Core/Business/Room/RoomType.cs b/EOM.TSHotelManager.Common.Core/Business/Room/RoomType.cs
index 171a6b095452cd041b1db90eb5e814401086802a..f9f631098af074bc5307af284f7fe9df8172846d 100644
--- a/EOM.TSHotelManager.Common.Core/Business/Room/RoomType.cs
+++ b/EOM.TSHotelManager.Common.Core/Business/Room/RoomType.cs
@@ -22,6 +22,8 @@
  *
  *模块说明：房间类型类
  */
+using EOM.TSHotelManager.Common.Util;
+
 namespace EOM.TSHotelManager.Common.Core
 {
     /// <summary>
@@ -34,27 +36,37 @@ namespace EOM.TSHotelManager.Common.Core
         /// 类型编号
         /// </summary>
         [SqlSugar.SugarColumn(ColumnName = "RoomType")]
+        [NeedValid]
         public int Roomtype { get; set; }
         /// <summary>
         /// 房间类型
         /// </summary>
+        [NeedValid]
         public string RoomName { get; set; }
 
         /// <summary>
         /// 房间租金
         /// </summary>
         [SqlSugar.SugarColumn(ColumnName = "room_rent", ColumnDataType = "decimal")]
+        [NeedValid]
         public decimal RoomRent { get; set; }
 
         /// <summary>
         /// 房间押金
         /// </summary>
         [SqlSugar.SugarColumn(ColumnName = "room_deposit")]
+        [NeedValid]
         public decimal RoomDeposit { get; set; }
 
         /// <summary>
         /// 删除标记
         /// </summary>
-        public int delete_mk { get; set; }
+        public int delete_mk { get; set; } = 0;
+
+        /// <summary>
+        /// 删除标记描述
+        /// </summary>
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public string DeleteMkNm { get; set; }
     }
 }
diff --git a/EOM.TSHotelManager.Common.Core/EOM.TSHotelManager.Common.Core.csproj b/EOM.TSHotelManager.Common.Core/EOM.TSHotelManager.Common.Core.csproj
index 2d59fdb04a5cb2a4de11ed19e7d6736b88c87ce5..af072397d59ee41f4c00af79f380437af34e048b 100644
--- a/EOM.TSHotelManager.Common.Core/EOM.TSHotelManager.Common.Core.csproj
+++ b/EOM.TSHotelManager.Common.Core/EOM.TSHotelManager.Common.Core.csproj
@@ -9,4 +9,8 @@
     <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.3.4" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\EOM.TSHotelManager.Common.Util\EOM.TSHotelManager.Common.Util.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/EOM.TSHotelManager.Common.Core/OSelectCustoAllDto.cs b/EOM.TSHotelManager.Common.Core/OSelectAllDto.cs
similarity index 94%
rename from EOM.TSHotelManager.Common.Core/OSelectCustoAllDto.cs
rename to EOM.TSHotelManager.Common.Core/OSelectAllDto.cs
index 456e374a68c12ede465ed4d5899656d791ad57bc..d7fca7ef2589503c4daa0a04e6f19ddb161f66f2 100644
--- a/EOM.TSHotelManager.Common.Core/OSelectCustoAllDto.cs
+++ b/EOM.TSHotelManager.Common.Core/OSelectAllDto.cs
@@ -29,12 +29,12 @@ namespace EOM.TSHotelManager.Common.Core
     /// 查询所有客户信息
     /// 输出DTO
     /// </summary>
-    public class OSelectCustoAllDto
+    public class OSelectAllDto<T>
     {
         /// <summary>
         /// 数据源
         /// </summary>
-        public List<Custo> listSource { get; set; }
+        public List<T> listSource { get; set; }
 
         /// <summary>
         /// 总数
diff --git a/EOM.TSHotelManager.Common.Core/Util/OperationLog.cs b/EOM.TSHotelManager.Common.Core/Util/OperationLog.cs
index a0ec77e90c1f94739a15fb800c695c33597e6434..33af193c5739c372edb96e9baf7745b989a310f3 100644
--- a/EOM.TSHotelManager.Common.Core/Util/OperationLog.cs
+++ b/EOM.TSHotelManager.Common.Core/Util/OperationLog.cs
@@ -51,6 +51,11 @@ namespace EOM.TSHotelManager.Common.Core
     [SqlSugar.SugarTable("operationlog")]
     public class OperationLog : BaseDTO
     {
+        /// <summary>
+        /// 日志ID
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnName = "OperationId",IsIdentity = true,IsPrimaryKey = true)]
+        public int OperationId { get; set; }
         /// <summary>
         /// 操作时间
         /// </summary>
diff --git a/EOM.TSHotelManager.EntityFramework/Repository/PgRepository.cs b/EOM.TSHotelManager.EntityFramework/Repository/PgRepository.cs
index d35d4a8622d5b0c6f387a14ff4fa540928f92e3c..8ef65c16a8dd62f3f448ab9d482eab33735de807 100644
--- a/EOM.TSHotelManager.EntityFramework/Repository/PgRepository.cs
+++ b/EOM.TSHotelManager.EntityFramework/Repository/PgRepository.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using SqlSugar;
+using System.Transactions;
 
 namespace EOM.TSHotelManager.EntityFramework
 {
@@ -7,31 +8,31 @@ namespace EOM.TSHotelManager.EntityFramework
     {
         public PgRepository(ISqlSugarClient context = null) : base(context)//注意这里要有默认值等于null
         {
-            if (context == null)
-            {
-                base.Context = new SqlSugarClient(new ConnectionConfig()
+                if (context == null)
                 {
-                    DbType = SqlSugar.DbType.PostgreSQL,//此处为设置数据库，支持各大主流数据库
-                    InitKeyType = InitKeyType.Attribute,//此处为初始化配置类型，有按特性进行初始化，也有其他的进行初始化
-                    IsAutoCloseConnection = true,//此处为是否自动关闭数据库连接，可以理解为是DBHelper里的Close()方法
-                    MoreSettings = new ConnMoreSettings()
+                    base.Context = new SqlSugarClient(new ConnectionConfig()
                     {
-                        PgSqlIsAutoToLower = false, //数据库存在大写字段的
-                                                    //，需要把这个设为false ，并且实体和字段名称要一样
-                                                    //如果数据库里的数据表本身就为小写，则改成true
-                                                    //详细可以参考官网https://www.donet5.com/Home/Doc
-                        DisableMillisecond = true,
-                    },
-                    ConnectionString = AppSettingsJson.GetAppSettings().GetConnectionString("PgSqlConnectStr")
-                });
+                        DbType = SqlSugar.DbType.PostgreSQL,//此处为设置数据库，支持各大主流数据库
+                        InitKeyType = InitKeyType.Attribute,//此处为初始化配置类型，有按特性进行初始化，也有其他的进行初始化
+                        IsAutoCloseConnection = true,//此处为是否自动关闭数据库连接，可以理解为是DBHelper里的Close()方法
+                        MoreSettings = new ConnMoreSettings()
+                        {
+                            PgSqlIsAutoToLower = false, //数据库存在大写字段的
+                                                        //，需要把这个设为false ，并且实体和字段名称要一样
+                                                        //如果数据库里的数据表本身就为小写，则改成true
+                                                        //详细可以参考官网https://www.donet5.com/Home/Doc
+                            DisableMillisecond = true
+                        },
+                        LanguageType = LanguageType.Chinese,
+                        ConnectionString = AppSettingsJson.GetAppSettings().GetConnectionString("PgSqlConnectStr")
+                    });
 
-                base.Context.Aop.OnError = (ex) =>
-                {
-                    //此处为AOP切面编程代码块，常用于数据库连接日志记录
-                    //或者查看详细的报错信息，打印ex的内容即可
-                };
-            }
+                    base.Context.Aop.OnError = (ex) =>
+                    {
+                        //此处为AOP切面编程代码块，常用于数据库连接日志记录
+                        //或者查看详细的报错信息，打印ex的内容即可
+                    };
+                }
         }
-
     }
 }
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Business/Customer/CustoController.cs b/EOM.TSHotelManager.WebApi/Controllers/Business/Customer/CustoController.cs
index 6310c7dc8375a75726aafa09fee87cca01685594..c9ffe4f2fde7292fe1b27cde34bb2654ed6bcf95 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Business/Customer/CustoController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Business/Customer/CustoController.cs
@@ -73,7 +73,7 @@ namespace EOM.TSHotelManager.WebApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public OSelectCustoAllDto SelectCustoAll([FromQuery] int pageIndex, int pageSize, bool onlyVip = false)
+        public OSelectAllDto<Custo> SelectCustoAll([FromQuery] int pageIndex, int pageSize, bool onlyVip = false)
         {
             return customerService.SelectCustoAll(pageIndex, pageSize, onlyVip);
         }
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomTypeController.cs b/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomTypeController.cs
index d9d5fac1490d5c3902d87b067f6daaa1fb7b1c6b..dc5d5d5992dd6eb042b6337a5b2561832290768a 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomTypeController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Business/Room/RoomTypeController.cs
@@ -29,9 +29,9 @@ namespace EOM.TSHotelManager.WebApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public List<RoomType> SelectRoomTypesAll()
+        public List<RoomType> SelectRoomTypesAll([FromQuery]int? isDelete)
         {
-            return roomTypeService.SelectRoomTypesAll();
+            return roomTypeService.SelectRoomTypesAll(isDelete);
         }
 
         /// <summary>
@@ -45,5 +45,48 @@ namespace EOM.TSHotelManager.WebApi.Controllers
             return roomTypeService.SelectRoomTypeByRoomNo(no);
         }
 
+        /// <summary>
+        /// 根据房间类型查询类型配置
+        /// </summary>
+        /// <param name="roomTypeId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public RoomType SelectRoomTypeByType([FromQuery]int roomTypeId)
+        {
+            return roomTypeService.SelectRoomTypeByType(roomTypeId);
+        }
+
+        /// <summary>
+        /// 添加房间状态
+        /// </summary>
+        /// <param name="roomType"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public bool InsertRoomType([FromBody] RoomType roomType)
+        {
+            return roomTypeService.InsertRoomType(roomType);
+        }
+
+        /// <summary>
+        /// 更新房间状态
+        /// </summary>
+        /// <param name="roomType"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public bool UpdateRoomType([FromBody] RoomType roomType)
+        {
+            return roomTypeService.UpdateRoomType(roomType);
+        }
+
+        /// <summary>
+        /// 删除房间状态
+        /// </summary>
+        /// <param name="roomType"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public bool DeleteRoomType([FromBody]RoomType roomType)
+        {
+            return roomTypeService.DeleteRoomType(roomType);
+        }
     }
 }
diff --git a/EOM.TSHotelManager.WebApi/Controllers/Util/AppController.cs b/EOM.TSHotelManager.WebApi/Controllers/Util/AppController.cs
index 9dc8a97c0f8bf5b03b7b25579a1faf251285f9ff..f440dd067706f6af876836e1fca26a2f2e579a60 100644
--- a/EOM.TSHotelManager.WebApi/Controllers/Util/AppController.cs
+++ b/EOM.TSHotelManager.WebApi/Controllers/Util/AppController.cs
@@ -63,9 +63,9 @@ namespace EOM.TSHotelManager.WebApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public List<OperationLog> SelectOperationlogAll()
+        public OSelectAllDto<OperationLog> SelectOperationlogAll([FromQuery]int? pageIndex, int? pageSize)
         {
-            return utilService.SelectOperationlogAll();
+            return utilService.SelectOperationlogAll(pageIndex, pageSize);
         }
     }
 }