Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Src/Dlhis.Canteen/Dlhis.Canteen.csproj

@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Kurisu.AspNetCore" Version="0.6.0" />
+    <PackageReference Include="Kurisu.AspNetCore" Version="0.7.0" />
   </ItemGroup>
 
 </Project>

Src/Dlhis.Canteen/appsettings.json

@@ -10,6 +10,9 @@
     "CommonRequestUrl": "http://common",
     "BasicRequestUrl": "http://basic"
   },
+  "FilterOptions": {
+    "EnableApiRequestLog": true
+  },
   "SqlSugarOptions": {
     "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;",
     "SlaveConnectionString": [],

Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs

@@ -10,7 +10,7 @@ namespace Dlhis.Entity.Sys.Entities;
 /// 设备权限
 /// </summary>
 [SugarTable(TableName = "DevicePermission", TableDescription = "设备权限")]
-public class DevicePermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted
+public class DevicePermissionEntity : SugarBaseEntity, ITenantId
 {
     /// <summary>
     /// 分配权限类型
@@ -24,7 +24,6 @@ public class DevicePermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted
     [SugarColumn(ColumnDescription = "分配值")]
     public string AssignValue { get; set; }
 
-
     /// <summary>
     /// 设备权限类型
     /// </summary>
@@ -37,7 +36,6 @@ public class DevicePermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted
     [SugarColumn(ColumnDescription = "类型值")]
     public Guid UniqueValue { get; set; }
 
-    public string TenantId { get; set; }
 
-    public bool IsDeleted { get; set; }
+    public string TenantId { get; set; }
 }