Merge branch 'develop' into working

# Conflicts:
#	bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll
#	bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe
#	bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
#	bin/Debug/net7.0/BMA.EHR.Recruit.Service.xml
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.xml
#	obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll
#	obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll
This commit is contained in:
Suphonchai Phoonsawat 2025-03-31 12:56:12 +07:00
commit c91666726a
11 changed files with 5757 additions and 1537 deletions

View file

@ -1 +1,5 @@
<<<<<<< HEAD
2afae04b6f3a7d44fcb90638ba50ba827580abc648c813a2624743f2ef385810
=======
118adb39fa17e550a6ea3f0884bcc470c472eff8c41b45c6866e270cec7ab054
>>>>>>> develop