change log middle ware for array

BMA.EHR.Recruit.Service.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ActiveDebugProfile>dotnet</ActiveDebugProfile>
+    <ActiveDebugProfile>https</ActiveDebugProfile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>

Core/RequestLoggingMiddleware.cs

@@ -169,10 +169,18 @@ namespace BMA.EHR.Recruit.Service.Core
                     responseBodyJson = JsonSerializer.Serialize(JsonSerializer.Deserialize<object>(responseBody), new JsonSerializerOptions { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping, WriteIndented = true, Converters = { new DateTimeFixConverter() } });
 
                 var json = JsonSerializer.Deserialize<JsonElement>(responseBody);
-                if (json.TryGetProperty("message", out var messageElement))
+                if(json.ValueKind == JsonValueKind.Array)
                 {
-                    message = messageElement.GetString();
+                    message = "success";
                 }
+                else
+                {
+                    if (json.TryGetProperty("message", out var messageElement))
+                    {
+                        message = messageElement.GetString();
+                    }
+                }
+                
 
                 var logData = new
                 {

obj/BMA.EHR.Recruit.Service.csproj.EntityFrameworkCore.targets

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="GetEFProjectMetadata">
-    <MSBuild Condition=" '$(TargetFramework)' == '' "
-             Projects="$(MSBuildProjectFile)"
-             Targets="GetEFProjectMetadata"
-             Properties="TargetFramework=$(TargetFrameworks.Split(';')[0]);EFProjectMetadataFile=$(EFProjectMetadataFile)" />
-    <ItemGroup Condition=" '$(TargetFramework)' != '' ">
-      <EFProjectMetadata Include="AssemblyName: $(AssemblyName)" />
-      <EFProjectMetadata Include="Language: $(Language)" />
-      <EFProjectMetadata Include="OutputPath: $(OutputPath)" />
-      <EFProjectMetadata Include="Platform: $(Platform)" />
-      <EFProjectMetadata Include="PlatformTarget: $(PlatformTarget)" />
-      <EFProjectMetadata Include="ProjectAssetsFile: $(ProjectAssetsFile)" />
-      <EFProjectMetadata Include="ProjectDir: $(ProjectDir)" />
-      <EFProjectMetadata Include="RootNamespace: $(RootNamespace)" />
-      <EFProjectMetadata Include="RuntimeFrameworkVersion: $(RuntimeFrameworkVersion)" />
-      <EFProjectMetadata Include="TargetFileName: $(TargetFileName)" />
-      <EFProjectMetadata Include="TargetFrameworkMoniker: $(TargetFrameworkMoniker)" />
-      <EFProjectMetadata Include="Nullable: $(Nullable)" />
-      <EFProjectMetadata Include="TargetFramework: $(TargetFramework)" />
-      <EFProjectMetadata Include="TargetPlatformIdentifier: $(TargetPlatformIdentifier)" />
-    </ItemGroup>
-    <WriteLinesToFile Condition=" '$(TargetFramework)' != '' "
-                      File="$(EFProjectMetadataFile)"
-                      Lines="@(EFProjectMetadata)" />
-  </Target>
-</Project>

obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json

@@ -110,13 +110,10 @@
               "target": "Package",
               "version": "[2.19.0, )"
             },
-<<<<<<< HEAD
             "NEST": {
               "target": "Package",
               "version": "[7.17.5, )"
             },
-=======
->>>>>>> develop
             "Newtonsoft.Json": {
               "target": "Package",
               "version": "[13.0.3, )"

obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs

@@ -15,7 +15,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("BMA.EHR.Recruit.Service")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04a324bff2631f94ba4d5e6df817618812353c7c")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+315ceb261a7529f9504e805035ff04155e388277")]
 [assembly: System.Reflection.AssemblyProductAttribute("BMA.EHR.Recruit.Service")]
 [assembly: System.Reflection.AssemblyTitleAttribute("BMA.EHR.Recruit.Service")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache

@@ -1 +1 @@
-c3d07eeb8270378e83e76975dc8c2133f5422a38fb6021b7d66d242f1ebbb676
+8eb40ef27d62a670801607859ed7839b8504135ed744839f97793d24af6ec292

obj/Debug/net7.0/Sentry.Attributes.cs

@@ -1,10 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-<<<<<<< HEAD
 //     Runtime Version:4.0.30319.42000
-=======
->>>>>>> develop
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

obj/Debug/net7.0/staticwebassets.build.json

@@ -1,6 +1,6 @@
 {
   "Version": 1,
-  "Hash": "B+VykfMPeMW2lxh8Xt4IjORytPAY4slnfBaa5dEnTK4=",
+  "Hash": "FjymhWTjFRfhrtJ0+WFFmS1Dhl7pnYOLe+xqVaL+ti4=",
   "Source": "BMA.EHR.Recruit.Service",
   "BasePath": "_content/BMA.EHR.Recruit.Service",
   "Mode": "Default",
@@ -8,6 +8,90 @@
   "ReferencedProjectsConfiguration": [],
   "DiscoveryPatterns": [],
   "Assets": [
+    {
+      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css",
+      "SourceId": "CoreAdmin",
+      "SourceType": "Package",
+      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
+      "BasePath": "_content/CoreAdmin",
+      "RelativePath": "css/bootstrap.css",
+      "AssetKind": "All",
+      "AssetMode": "All",
+      "AssetRole": "Primary",
+      "AssetMergeBehavior": "",
+      "AssetMergeSource": "",
+      "RelatedAsset": "",
+      "AssetTraitName": "",
+      "AssetTraitValue": "",
+      "Fingerprint": "o2ma61z60z",
+      "Integrity": "wFfTdiDy/HyWFNHWOiQouhJYtLhqKEyhVtWsfX9A7xc=",
+      "CopyToOutputDirectory": "Never",
+      "CopyToPublishDirectory": "PreserveNewest",
+      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css"
+    },
+    {
+      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css.map",
+      "SourceId": "CoreAdmin",
+      "SourceType": "Package",
+      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
+      "BasePath": "_content/CoreAdmin",
+      "RelativePath": "css/bootstrap.css.map",
+      "AssetKind": "All",
+      "AssetMode": "All",
+      "AssetRole": "Primary",
+      "AssetMergeBehavior": "",
+      "AssetMergeSource": "",
+      "RelatedAsset": "",
+      "AssetTraitName": "",
+      "AssetTraitValue": "",
+      "Fingerprint": "mkjvklbc72",
+      "Integrity": "KtOJK8YVJt6opmOTJRZuBNlq4MAO3suVoFNSgnIWxWE=",
+      "CopyToOutputDirectory": "Never",
+      "CopyToPublishDirectory": "PreserveNewest",
+      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css.map"
+    },
+    {
+      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css",
+      "SourceId": "CoreAdmin",
+      "SourceType": "Package",
+      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
+      "BasePath": "_content/CoreAdmin",
+      "RelativePath": "css/bootstrap.min.css",
+      "AssetKind": "All",
+      "AssetMode": "All",
+      "AssetRole": "Primary",
+      "AssetMergeBehavior": "",
+      "AssetMergeSource": "",
+      "RelatedAsset": "",
+      "AssetTraitName": "",
+      "AssetTraitValue": "",
+      "Fingerprint": "r61markcoc",
+      "Integrity": "fXqQQ/S+0wP+KXSsTjuhDWshTnD3rlSXhrotNH3gX4E=",
+      "CopyToOutputDirectory": "Never",
+      "CopyToPublishDirectory": "PreserveNewest",
+      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css"
+    },
+    {
+      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css.map",
+      "SourceId": "CoreAdmin",
+      "SourceType": "Package",
+      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
+      "BasePath": "_content/CoreAdmin",
+      "RelativePath": "css/bootstrap.min.css.map",
+      "AssetKind": "All",
+      "AssetMode": "All",
+      "AssetRole": "Primary",
+      "AssetMergeBehavior": "",
+      "AssetMergeSource": "",
+      "RelatedAsset": "",
+      "AssetTraitName": "",
+      "AssetTraitValue": "",
+      "Fingerprint": "eexf3o8jdh",
+      "Integrity": "KiZgBYomlnG90l25zW4JPdDXw3SUdIUtk7HjTqolN0s=",
+      "CopyToOutputDirectory": "Never",
+      "CopyToPublishDirectory": "PreserveNewest",
+      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css.map"
+    },
     {
       "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap-dark.css",
       "SourceId": "CoreAdmin",
@@ -219,12 +303,12 @@
       "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap-reboot.min.css.map"
     },
     {
-      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css",
+      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.css",
       "SourceId": "CoreAdmin",
       "SourceType": "Package",
       "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
       "BasePath": "_content/CoreAdmin",
-      "RelativePath": "css/bootstrap.css",
+      "RelativePath": "css/easymde/easymde.css",
       "AssetKind": "All",
       "AssetMode": "All",
       "AssetRole": "Primary",
@@ -233,19 +317,19 @@
       "RelatedAsset": "",
       "AssetTraitName": "",
       "AssetTraitValue": "",
-      "Fingerprint": "o2ma61z60z",
+      "Fingerprint": "5mytmx9lqh",
-      "Integrity": "wFfTdiDy/HyWFNHWOiQouhJYtLhqKEyhVtWsfX9A7xc=",
+      "Integrity": "fR45ZEDtjBBqkENoxiaOqZE826+Iukp/FKbVlvf8IJY=",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css"
+      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.css"
     },
     {
-      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css.map",
+      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.min.css",
       "SourceId": "CoreAdmin",
       "SourceType": "Package",
       "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
       "BasePath": "_content/CoreAdmin",
-      "RelativePath": "css/bootstrap.css.map",
+      "RelativePath": "css/easymde/easymde.min.css",
       "AssetKind": "All",
       "AssetMode": "All",
       "AssetRole": "Primary",
@@ -254,53 +338,11 @@
       "RelatedAsset": "",
       "AssetTraitName": "",
       "AssetTraitValue": "",
-      "Fingerprint": "mkjvklbc72",
+      "Fingerprint": "hzbvlxl735",
-      "Integrity": "KtOJK8YVJt6opmOTJRZuBNlq4MAO3suVoFNSgnIWxWE=",
+      "Integrity": "bbcGE3wFLst4Omr497gtqlo2Gv5iKVJZxG9DY6qIkXE=",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css.map"
+      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.min.css"
-    },
-    {
-      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css",
-      "SourceId": "CoreAdmin",
-      "SourceType": "Package",
-      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
-      "BasePath": "_content/CoreAdmin",
-      "RelativePath": "css/bootstrap.min.css",
-      "AssetKind": "All",
-      "AssetMode": "All",
-      "AssetRole": "Primary",
-      "AssetMergeBehavior": "",
-      "AssetMergeSource": "",
-      "RelatedAsset": "",
-      "AssetTraitName": "",
-      "AssetTraitValue": "",
-      "Fingerprint": "r61markcoc",
-      "Integrity": "fXqQQ/S+0wP+KXSsTjuhDWshTnD3rlSXhrotNH3gX4E=",
-      "CopyToOutputDirectory": "Never",
-      "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css"
-    },
-    {
-      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css.map",
-      "SourceId": "CoreAdmin",
-      "SourceType": "Package",
-      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
-      "BasePath": "_content/CoreAdmin",
-      "RelativePath": "css/bootstrap.min.css.map",
-      "AssetKind": "All",
-      "AssetMode": "All",
-      "AssetRole": "Primary",
-      "AssetMergeBehavior": "",
-      "AssetMergeSource": "",
-      "RelatedAsset": "",
-      "AssetTraitName": "",
-      "AssetTraitValue": "",
-      "Fingerprint": "eexf3o8jdh",
-      "Integrity": "KiZgBYomlnG90l25zW4JPdDXw3SUdIUtk7HjTqolN0s=",
-      "CopyToOutputDirectory": "Never",
-      "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css.map"
     },
     {
       "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde-dark.css",
@@ -344,48 +386,6 @@
       "CopyToPublishDirectory": "PreserveNewest",
       "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde-dark.min.css"
     },
-    {
-      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.css",
-      "SourceId": "CoreAdmin",
-      "SourceType": "Package",
-      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
-      "BasePath": "_content/CoreAdmin",
-      "RelativePath": "css/easymde/easymde.css",
-      "AssetKind": "All",
-      "AssetMode": "All",
-      "AssetRole": "Primary",
-      "AssetMergeBehavior": "",
-      "AssetMergeSource": "",
-      "RelatedAsset": "",
-      "AssetTraitName": "",
-      "AssetTraitValue": "",
-      "Fingerprint": "5mytmx9lqh",
-      "Integrity": "fR45ZEDtjBBqkENoxiaOqZE826+Iukp/FKbVlvf8IJY=",
-      "CopyToOutputDirectory": "Never",
-      "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.css"
-    },
-    {
-      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.min.css",
-      "SourceId": "CoreAdmin",
-      "SourceType": "Package",
-      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
-      "BasePath": "_content/CoreAdmin",
-      "RelativePath": "css/easymde/easymde.min.css",
-      "AssetKind": "All",
-      "AssetMode": "All",
-      "AssetRole": "Primary",
-      "AssetMergeBehavior": "",
-      "AssetMergeSource": "",
-      "RelatedAsset": "",
-      "AssetTraitName": "",
-      "AssetTraitValue": "",
-      "Fingerprint": "hzbvlxl735",
-      "Integrity": "bbcGE3wFLst4Omr497gtqlo2Gv5iKVJZxG9DY6qIkXE=",
-      "CopyToOutputDirectory": "Never",
-      "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.min.css"
-    },
     {
       "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\jquery-ui.min.css",
       "SourceId": "CoreAdmin",
@@ -428,27 +428,6 @@
       "CopyToPublishDirectory": "PreserveNewest",
       "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\fonts\\grid-glyphs.woff"
     },
-    {
-      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\mvc-grid-dark.css",
-      "SourceId": "CoreAdmin",
-      "SourceType": "Package",
-      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
-      "BasePath": "_content/CoreAdmin",
-      "RelativePath": "css/mvc-grid/mvc-grid-dark.css",
-      "AssetKind": "All",
-      "AssetMode": "All",
-      "AssetRole": "Primary",
-      "AssetMergeBehavior": "",
-      "AssetMergeSource": "",
-      "RelatedAsset": "",
-      "AssetTraitName": "",
-      "AssetTraitValue": "",
-      "Fingerprint": "veobziqlx3",
-      "Integrity": "V7tItYnnWLFcU26hRCRP/FRWbFgr4LMCN+fMf6nGpYY=",
-      "CopyToOutputDirectory": "Never",
-      "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\mvc-grid-dark.css"
-    },
     {
       "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\mvc-grid.css",
       "SourceId": "CoreAdmin",
@@ -470,6 +449,27 @@
       "CopyToPublishDirectory": "PreserveNewest",
       "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\mvc-grid.css"
     },
+    {
+      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\mvc-grid-dark.css",
+      "SourceId": "CoreAdmin",
+      "SourceType": "Package",
+      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
+      "BasePath": "_content/CoreAdmin",
+      "RelativePath": "css/mvc-grid/mvc-grid-dark.css",
+      "AssetKind": "All",
+      "AssetMode": "All",
+      "AssetRole": "Primary",
+      "AssetMergeBehavior": "",
+      "AssetMergeSource": "",
+      "RelatedAsset": "",
+      "AssetTraitName": "",
+      "AssetTraitValue": "",
+      "Fingerprint": "veobziqlx3",
+      "Integrity": "V7tItYnnWLFcU26hRCRP/FRWbFgr4LMCN+fMf6nGpYY=",
+      "CopyToOutputDirectory": "Never",
+      "CopyToPublishDirectory": "PreserveNewest",
+      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\mvc-grid-dark.css"
+    },
     {
       "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\site.css",
       "SourceId": "CoreAdmin",
@@ -596,27 +596,6 @@
       "CopyToPublishDirectory": "PreserveNewest",
       "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\easymde\\easymde.min.js"
     },
-    {
-      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\jquery-ui.min.js",
-      "SourceId": "CoreAdmin",
-      "SourceType": "Package",
-      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
-      "BasePath": "_content/CoreAdmin",
-      "RelativePath": "js/jquery-ui.min.js",
-      "AssetKind": "All",
-      "AssetMode": "All",
-      "AssetRole": "Primary",
-      "AssetMergeBehavior": "",
-      "AssetMergeSource": "",
-      "RelatedAsset": "",
-      "AssetTraitName": "",
-      "AssetTraitValue": "",
-      "Fingerprint": "vy10jqsrv0",
-      "Integrity": "CdveF1sdbPTwxS7oW9wpYbvN519xustroY6DdE41cBc=",
-      "CopyToOutputDirectory": "Never",
-      "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\jquery-ui.min.js"
-    },
     {
       "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\jquery.js",
       "SourceId": "CoreAdmin",
@@ -743,6 +722,27 @@
       "CopyToPublishDirectory": "PreserveNewest",
       "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\jquery.validate.unobtrusive.min.js"
     },
+    {
+      "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\jquery-ui.min.js",
+      "SourceId": "CoreAdmin",
+      "SourceType": "Package",
+      "ContentRoot": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\",
+      "BasePath": "_content/CoreAdmin",
+      "RelativePath": "js/jquery-ui.min.js",
+      "AssetKind": "All",
+      "AssetMode": "All",
+      "AssetRole": "Primary",
+      "AssetMergeBehavior": "",
+      "AssetMergeSource": "",
+      "RelatedAsset": "",
+      "AssetTraitName": "",
+      "AssetTraitValue": "",
+      "Fingerprint": "vy10jqsrv0",
+      "Integrity": "CdveF1sdbPTwxS7oW9wpYbvN519xustroY6DdE41cBc=",
+      "CopyToOutputDirectory": "Never",
+      "CopyToPublishDirectory": "PreserveNewest",
+      "OriginalItemSpec": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\jquery-ui.min.js"
+    },
     {
       "Identity": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\mvc-grid\\mvc-grid.js",
       "SourceId": "CoreAdmin",
@@ -787,6 +787,154 @@
     }
   ],
   "Endpoints": [
+    {
+      "Route": "_content/CoreAdmin/css/bootstrap.css",
+      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css",
+      "Selectors": [],
+      "ResponseHeaders": [
+        {
+          "Name": "Accept-Ranges",
+          "Value": "bytes"
+        },
+        {
+          "Name": "Content-Length",
+          "Value": "209709"
+        },
+        {
+          "Name": "Content-Type",
+          "Value": "text/css"
+        },
+        {
+          "Name": "ETag",
+          "Value": "\"wFfTdiDy/HyWFNHWOiQouhJYtLhqKEyhVtWsfX9A7xc=\""
+        },
+        {
+          "Name": "Last-Modified",
+          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
+        },
+        {
+          "Name": "Cache-Control",
+          "Value": "no-cache"
+        }
+      ],
+      "EndpointProperties": [
+        {
+          "Name": "integrity",
+          "Value": "sha256-wFfTdiDy/HyWFNHWOiQouhJYtLhqKEyhVtWsfX9A7xc="
+        }
+      ]
+    },
+    {
+      "Route": "_content/CoreAdmin/css/bootstrap.css.map",
+      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css.map",
+      "Selectors": [],
+      "ResponseHeaders": [
+        {
+          "Name": "Accept-Ranges",
+          "Value": "bytes"
+        },
+        {
+          "Name": "Content-Length",
+          "Value": "511248"
+        },
+        {
+          "Name": "Content-Type",
+          "Value": "text/plain"
+        },
+        {
+          "Name": "ETag",
+          "Value": "\"KtOJK8YVJt6opmOTJRZuBNlq4MAO3suVoFNSgnIWxWE=\""
+        },
+        {
+          "Name": "Last-Modified",
+          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
+        },
+        {
+          "Name": "Cache-Control",
+          "Value": "no-cache"
+        }
+      ],
+      "EndpointProperties": [
+        {
+          "Name": "integrity",
+          "Value": "sha256-KtOJK8YVJt6opmOTJRZuBNlq4MAO3suVoFNSgnIWxWE="
+        }
+      ]
+    },
+    {
+      "Route": "_content/CoreAdmin/css/bootstrap.min.css",
+      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css",
+      "Selectors": [],
+      "ResponseHeaders": [
+        {
+          "Name": "Accept-Ranges",
+          "Value": "bytes"
+        },
+        {
+          "Name": "Content-Length",
+          "Value": "161415"
+        },
+        {
+          "Name": "Content-Type",
+          "Value": "text/css"
+        },
+        {
+          "Name": "ETag",
+          "Value": "\"fXqQQ/S+0wP+KXSsTjuhDWshTnD3rlSXhrotNH3gX4E=\""
+        },
+        {
+          "Name": "Last-Modified",
+          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
+        },
+        {
+          "Name": "Cache-Control",
+          "Value": "no-cache"
+        }
+      ],
+      "EndpointProperties": [
+        {
+          "Name": "integrity",
+          "Value": "sha256-fXqQQ/S+0wP+KXSsTjuhDWshTnD3rlSXhrotNH3gX4E="
+        }
+      ]
+    },
+    {
+      "Route": "_content/CoreAdmin/css/bootstrap.min.css.map",
+      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css.map",
+      "Selectors": [],
+      "ResponseHeaders": [
+        {
+          "Name": "Accept-Ranges",
+          "Value": "bytes"
+        },
+        {
+          "Name": "Content-Length",
+          "Value": "650715"
+        },
+        {
+          "Name": "Content-Type",
+          "Value": "text/plain"
+        },
+        {
+          "Name": "ETag",
+          "Value": "\"KiZgBYomlnG90l25zW4JPdDXw3SUdIUtk7HjTqolN0s=\""
+        },
+        {
+          "Name": "Last-Modified",
+          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
+        },
+        {
+          "Name": "Cache-Control",
+          "Value": "no-cache"
+        }
+      ],
+      "EndpointProperties": [
+        {
+          "Name": "integrity",
+          "Value": "sha256-KiZgBYomlnG90l25zW4JPdDXw3SUdIUtk7HjTqolN0s="
+        }
+      ]
+    },
     {
       "Route": "_content/CoreAdmin/css/bootstrap-dark.css",
       "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap-dark.css",
@@ -1158,8 +1306,8 @@
       ]
     },
     {
-      "Route": "_content/CoreAdmin/css/bootstrap.css",
+      "Route": "_content/CoreAdmin/css/easymde/easymde.css",
-      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css",
+      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.css",
       "Selectors": [],
       "ResponseHeaders": [
         {
@@ -1168,7 +1316,7 @@
         },
         {
           "Name": "Content-Length",
-          "Value": "209709"
+          "Value": "16847"
         },
         {
           "Name": "Content-Type",
@@ -1176,7 +1324,7 @@
         },
         {
           "Name": "ETag",
-          "Value": "\"wFfTdiDy/HyWFNHWOiQouhJYtLhqKEyhVtWsfX9A7xc=\""
+          "Value": "\"fR45ZEDtjBBqkENoxiaOqZE826+Iukp/FKbVlvf8IJY=\""
         },
         {
           "Name": "Last-Modified",
@@ -1190,13 +1338,13 @@
       "EndpointProperties": [
         {
           "Name": "integrity",
-          "Value": "sha256-wFfTdiDy/HyWFNHWOiQouhJYtLhqKEyhVtWsfX9A7xc="
+          "Value": "sha256-fR45ZEDtjBBqkENoxiaOqZE826+Iukp/FKbVlvf8IJY="
         }
       ]
     },
     {
-      "Route": "_content/CoreAdmin/css/bootstrap.css.map",
+      "Route": "_content/CoreAdmin/css/easymde/easymde.min.css",
-      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.css.map",
+      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.min.css",
       "Selectors": [],
       "ResponseHeaders": [
         {
@@ -1205,44 +1353,7 @@
         },
         {
           "Name": "Content-Length",
-          "Value": "511248"
+          "Value": "12429"
-        },
-        {
-          "Name": "Content-Type",
-          "Value": "text/plain"
-        },
-        {
-          "Name": "ETag",
-          "Value": "\"KtOJK8YVJt6opmOTJRZuBNlq4MAO3suVoFNSgnIWxWE=\""
-        },
-        {
-          "Name": "Last-Modified",
-          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
-        },
-        {
-          "Name": "Cache-Control",
-          "Value": "no-cache"
-        }
-      ],
-      "EndpointProperties": [
-        {
-          "Name": "integrity",
-          "Value": "sha256-KtOJK8YVJt6opmOTJRZuBNlq4MAO3suVoFNSgnIWxWE="
-        }
-      ]
-    },
-    {
-      "Route": "_content/CoreAdmin/css/bootstrap.min.css",
-      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css",
-      "Selectors": [],
-      "ResponseHeaders": [
-        {
-          "Name": "Accept-Ranges",
-          "Value": "bytes"
-        },
-        {
-          "Name": "Content-Length",
-          "Value": "161415"
         },
         {
           "Name": "Content-Type",
@@ -1250,7 +1361,7 @@
         },
         {
           "Name": "ETag",
-          "Value": "\"fXqQQ/S+0wP+KXSsTjuhDWshTnD3rlSXhrotNH3gX4E=\""
+          "Value": "\"bbcGE3wFLst4Omr497gtqlo2Gv5iKVJZxG9DY6qIkXE=\""
         },
         {
           "Name": "Last-Modified",
@@ -1264,44 +1375,7 @@
       "EndpointProperties": [
         {
           "Name": "integrity",
-          "Value": "sha256-fXqQQ/S+0wP+KXSsTjuhDWshTnD3rlSXhrotNH3gX4E="
+          "Value": "sha256-bbcGE3wFLst4Omr497gtqlo2Gv5iKVJZxG9DY6qIkXE="
-        }
-      ]
-    },
-    {
-      "Route": "_content/CoreAdmin/css/bootstrap.min.css.map",
-      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\bootstrap.min.css.map",
-      "Selectors": [],
-      "ResponseHeaders": [
-        {
-          "Name": "Accept-Ranges",
-          "Value": "bytes"
-        },
-        {
-          "Name": "Content-Length",
-          "Value": "650715"
-        },
-        {
-          "Name": "Content-Type",
-          "Value": "text/plain"
-        },
-        {
-          "Name": "ETag",
-          "Value": "\"KiZgBYomlnG90l25zW4JPdDXw3SUdIUtk7HjTqolN0s=\""
-        },
-        {
-          "Name": "Last-Modified",
-          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
-        },
-        {
-          "Name": "Cache-Control",
-          "Value": "no-cache"
-        }
-      ],
-      "EndpointProperties": [
-        {
-          "Name": "integrity",
-          "Value": "sha256-KiZgBYomlnG90l25zW4JPdDXw3SUdIUtk7HjTqolN0s="
         }
       ]
     },
@@ -1379,80 +1453,6 @@
         }
       ]
     },
-    {
-      "Route": "_content/CoreAdmin/css/easymde/easymde.css",
-      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.css",
-      "Selectors": [],
-      "ResponseHeaders": [
-        {
-          "Name": "Accept-Ranges",
-          "Value": "bytes"
-        },
-        {
-          "Name": "Content-Length",
-          "Value": "16847"
-        },
-        {
-          "Name": "Content-Type",
-          "Value": "text/css"
-        },
-        {
-          "Name": "ETag",
-          "Value": "\"fR45ZEDtjBBqkENoxiaOqZE826+Iukp/FKbVlvf8IJY=\""
-        },
-        {
-          "Name": "Last-Modified",
-          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
-        },
-        {
-          "Name": "Cache-Control",
-          "Value": "no-cache"
-        }
-      ],
-      "EndpointProperties": [
-        {
-          "Name": "integrity",
-          "Value": "sha256-fR45ZEDtjBBqkENoxiaOqZE826+Iukp/FKbVlvf8IJY="
-        }
-      ]
-    },
-    {
-      "Route": "_content/CoreAdmin/css/easymde/easymde.min.css",
-      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\easymde\\easymde.min.css",
-      "Selectors": [],
-      "ResponseHeaders": [
-        {
-          "Name": "Accept-Ranges",
-          "Value": "bytes"
-        },
-        {
-          "Name": "Content-Length",
-          "Value": "12429"
-        },
-        {
-          "Name": "Content-Type",
-          "Value": "text/css"
-        },
-        {
-          "Name": "ETag",
-          "Value": "\"bbcGE3wFLst4Omr497gtqlo2Gv5iKVJZxG9DY6qIkXE=\""
-        },
-        {
-          "Name": "Last-Modified",
-          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
-        },
-        {
-          "Name": "Cache-Control",
-          "Value": "no-cache"
-        }
-      ],
-      "EndpointProperties": [
-        {
-          "Name": "integrity",
-          "Value": "sha256-bbcGE3wFLst4Omr497gtqlo2Gv5iKVJZxG9DY6qIkXE="
-        }
-      ]
-    },
     {
       "Route": "_content/CoreAdmin/css/jquery-ui.min.css",
       "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\jquery-ui.min.css",
@@ -1527,43 +1527,6 @@
         }
       ]
     },
-    {
-      "Route": "_content/CoreAdmin/css/mvc-grid/mvc-grid-dark.css",
-      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\mvc-grid-dark.css",
-      "Selectors": [],
-      "ResponseHeaders": [
-        {
-          "Name": "Accept-Ranges",
-          "Value": "bytes"
-        },
-        {
-          "Name": "Content-Length",
-          "Value": "9229"
-        },
-        {
-          "Name": "Content-Type",
-          "Value": "text/css"
-        },
-        {
-          "Name": "ETag",
-          "Value": "\"V7tItYnnWLFcU26hRCRP/FRWbFgr4LMCN+fMf6nGpYY=\""
-        },
-        {
-          "Name": "Last-Modified",
-          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
-        },
-        {
-          "Name": "Cache-Control",
-          "Value": "no-cache"
-        }
-      ],
-      "EndpointProperties": [
-        {
-          "Name": "integrity",
-          "Value": "sha256-V7tItYnnWLFcU26hRCRP/FRWbFgr4LMCN+fMf6nGpYY="
-        }
-      ]
-    },
     {
       "Route": "_content/CoreAdmin/css/mvc-grid/mvc-grid.css",
       "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\mvc-grid.css",
@@ -1601,6 +1564,43 @@
         }
       ]
     },
+    {
+      "Route": "_content/CoreAdmin/css/mvc-grid/mvc-grid-dark.css",
+      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\mvc-grid\\mvc-grid-dark.css",
+      "Selectors": [],
+      "ResponseHeaders": [
+        {
+          "Name": "Accept-Ranges",
+          "Value": "bytes"
+        },
+        {
+          "Name": "Content-Length",
+          "Value": "9229"
+        },
+        {
+          "Name": "Content-Type",
+          "Value": "text/css"
+        },
+        {
+          "Name": "ETag",
+          "Value": "\"V7tItYnnWLFcU26hRCRP/FRWbFgr4LMCN+fMf6nGpYY=\""
+        },
+        {
+          "Name": "Last-Modified",
+          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
+        },
+        {
+          "Name": "Cache-Control",
+          "Value": "no-cache"
+        }
+      ],
+      "EndpointProperties": [
+        {
+          "Name": "integrity",
+          "Value": "sha256-V7tItYnnWLFcU26hRCRP/FRWbFgr4LMCN+fMf6nGpYY="
+        }
+      ]
+    },
     {
       "Route": "_content/CoreAdmin/css/site.css",
       "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\css\\site.css",
@@ -1823,43 +1823,6 @@
         }
       ]
     },
-    {
-      "Route": "_content/CoreAdmin/js/jquery-ui.min.js",
-      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\jquery-ui.min.js",
-      "Selectors": [],
-      "ResponseHeaders": [
-        {
-          "Name": "Accept-Ranges",
-          "Value": "bytes"
-        },
-        {
-          "Name": "Content-Length",
-          "Value": "30682"
-        },
-        {
-          "Name": "Content-Type",
-          "Value": "text/javascript"
-        },
-        {
-          "Name": "ETag",
-          "Value": "\"CdveF1sdbPTwxS7oW9wpYbvN519xustroY6DdE41cBc=\""
-        },
-        {
-          "Name": "Last-Modified",
-          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
-        },
-        {
-          "Name": "Cache-Control",
-          "Value": "no-cache"
-        }
-      ],
-      "EndpointProperties": [
-        {
-          "Name": "integrity",
-          "Value": "sha256-CdveF1sdbPTwxS7oW9wpYbvN519xustroY6DdE41cBc="
-        }
-      ]
-    },
     {
       "Route": "_content/CoreAdmin/js/jquery.js",
       "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\jquery.js",
@@ -2082,6 +2045,43 @@
         }
       ]
     },
+    {
+      "Route": "_content/CoreAdmin/js/jquery-ui.min.js",
+      "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\jquery-ui.min.js",
+      "Selectors": [],
+      "ResponseHeaders": [
+        {
+          "Name": "Accept-Ranges",
+          "Value": "bytes"
+        },
+        {
+          "Name": "Content-Length",
+          "Value": "30682"
+        },
+        {
+          "Name": "Content-Type",
+          "Value": "text/javascript"
+        },
+        {
+          "Name": "ETag",
+          "Value": "\"CdveF1sdbPTwxS7oW9wpYbvN519xustroY6DdE41cBc=\""
+        },
+        {
+          "Name": "Last-Modified",
+          "Value": "Fri, 18 Nov 2022 08:48:42 GMT"
+        },
+        {
+          "Name": "Cache-Control",
+          "Value": "no-cache"
+        }
+      ],
+      "EndpointProperties": [
+        {
+          "Name": "integrity",
+          "Value": "sha256-CdveF1sdbPTwxS7oW9wpYbvN519xustroY6DdE41cBc="
+        }
+      ]
+    },
     {
       "Route": "_content/CoreAdmin/js/mvc-grid/mvc-grid.js",
       "AssetFile": "C:\\Users\\jack\\.nuget\\packages\\coreadmin\\2.7.0\\staticwebassets\\js\\mvc-grid\\mvc-grid.js",

obj/project.assets.json

@@ -2564,7 +2564,6 @@
           }
         }
       },
-<<<<<<< HEAD
       "NEST/7.17.5": {
         "type": "package",
         "dependencies": {
@@ -2581,8 +2580,6 @@
           }
         }
       },
-=======
->>>>>>> develop
       "NETStandard.Library/1.6.1": {
         "type": "package",
         "dependencies": {
@@ -8273,7 +8270,6 @@
         "mysqlconnector.nuspec"
       ]
     },
-<<<<<<< HEAD
     "NEST/7.17.5": {
       "sha512": "bo9UyuIoVRx4IUQiuC8ZrlZuvAXKIccernC7UUKukQCEmRq2eVIk+gubHlnMQljrP51q0mN4cjgy9vv5uZPkoA==",
       "type": "package",
@@ -8293,8 +8289,6 @@
         "nuget-icon.png"
       ]
     },
-=======
->>>>>>> develop
     "NETStandard.Library/1.6.1": {
       "sha512": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==",
       "type": "package",
@@ -13716,10 +13710,7 @@
       "Microsoft.VisualStudio.Azure.Containers.Tools.Targets >= 1.17.0",
       "MongoDB.Driver >= 2.19.0",
       "MongoDB.Driver.GridFS >= 2.19.0",
-<<<<<<< HEAD
       "NEST >= 7.17.5",
-=======
->>>>>>> develop
       "Newtonsoft.Json >= 13.0.3",
       "Pomelo.EntityFrameworkCore.MySql >= 7.0.0",
       "Pomelo.EntityFrameworkCore.MySql.Design >= 1.1.2",
@@ -13846,13 +13837,10 @@
             "target": "Package",
             "version": "[2.19.0, )"
           },
-<<<<<<< HEAD
           "NEST": {
             "target": "Package",
             "version": "[7.17.5, )"
           },
-=======
->>>>>>> develop
           "Newtonsoft.Json": {
             "target": "Package",
             "version": "[13.0.3, )"

obj/project.nuget.cache

@@ -1,10 +1,6 @@
 {
   "version": 2,
-<<<<<<< HEAD
   "dgSpecHash": "2b/aE3ltIAI=",
-=======
-  "dgSpecHash": "so4FDnKvBAM=",
->>>>>>> develop
   "success": true,
   "projectFilePath": "D:\\Develop\\SourceCode\\hrms-api-recruit\\BMA.EHR.Recruit.Service.csproj",
   "expectedPackageFiles": [
@@ -153,10 +149,7 @@
     "C:\\Users\\jack\\.nuget\\packages\\mono.texttemplating\\2.2.1\\mono.texttemplating.2.2.1.nupkg.sha512",
     "C:\\Users\\jack\\.nuget\\packages\\mysql.data\\8.0.29\\mysql.data.8.0.29.nupkg.sha512",
     "C:\\Users\\jack\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512",
-<<<<<<< HEAD
     "C:\\Users\\jack\\.nuget\\packages\\nest\\7.17.5\\nest.7.17.5.nupkg.sha512",
-=======
->>>>>>> develop
     "C:\\Users\\jack\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
     "C:\\Users\\jack\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
     "C:\\Users\\jack\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",