Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m1s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m1s
# Conflicts: # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
This commit is contained in:
commit
66ef0b1d7c
28 changed files with 353 additions and 333 deletions
|
|
@ -14,7 +14,11 @@ using System.Reflection;
|
|||
[assembly: System.Reflection.AssemblyCompanyAttribute("BMA.EHR.Recruit.Service")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
<<<<<<< HEAD
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+82e6bcc95bc1a1582fcc9513f288ef318f5adb72")]
|
||||
=======
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d245236a144a9ba61661418db9ef1a8a2225d063")]
|
||||
>>>>>>> develop
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("BMA.EHR.Recruit.Service")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("BMA.EHR.Recruit.Service")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
|
|
|||
|
|
@ -1 +1,5 @@
|
|||
<<<<<<< HEAD
|
||||
e6710ad194b71c423e48e4496ccfad9f61fd14ce3d380484fc72866c29b8ac89
|
||||
=======
|
||||
157a45ee45981ce605f03881ba3934018f157203e24d6fc6a8c2d7a6fcd5987d
|
||||
>>>>>>> develop
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
8188c282bc629ad2d7d5214383ab88320df533ed04ee2e8cbc2677b42449240c
|
||||
fffe8f4cde7b33605d40e5b420d9196d180ff4220ccade9492b65347ce5e09fb
|
||||
|
|
|
|||
|
|
@ -184,23 +184,9 @@ D:/Develop/SourceCode/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.
|
|||
D:/Develop/SourceCode/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
|
||||
D:/Develop/SourceCode/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.genruntimeconfig.cache
|
||||
D:/Develop/SourceCode/hrms-api-recruit/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.AssemblyReference.cache
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/rpswa.dswa.cache.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.GeneratedMSBuildEditorConfig.editorconfig
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/Sentry.Attributes.cs
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.cache
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.MvcApplicationPartsAssemblyInfo.cs
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.MvcApplicationPartsAssemblyInfo.cache
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.sourcelink.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.xml
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/nuget.config
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/appsettings.Development.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/appsettings.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/nuget.config
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/BMA.EHR.Recruit.Service.staticwebassets.runtime.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/BMA.EHR.Recruit.Service.staticwebassets.endpoints.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/Templates/ExamList.xlsx
|
||||
|
|
@ -357,6 +343,16 @@ D:/Develop/SourceCode/hrms-api-recruit/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Serv
|
|||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/runtimes/win/lib/netstandard2.0/System.Runtime.Caching.dll
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/bin/Debug/net7.0/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.AssemblyReference.cache
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/rpswa.dswa.cache.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.GeneratedMSBuildEditorConfig.editorconfig
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/Sentry.Attributes.cs
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.cache
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.MvcApplicationPartsAssemblyInfo.cs
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.MvcApplicationPartsAssemblyInfo.cache
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.sourcelink.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/rjimswa.dswa.cache.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/rjsmrazor.dswa.cache.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/rjsmcshtml.dswa.cache.json
|
||||
|
|
@ -366,5 +362,9 @@ D:/Develop/SourceCode/hrms-api-recruit/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Serv
|
|||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/staticwebassets.development.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/staticwebassets.build.endpoints.json
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR..8088DF8F.Up2Date
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.xml
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.genruntimeconfig.cache
|
||||
/Users/suphonchaip/Develop/hrms/hrms-api-recruit/obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue