no message
Merge branch 'master' of https://github.com/jungfengpaulwang/EMBAUDTDetailContentBase

Conflicts:
	UDTDetailContentBase/bin/Debug/UDTDetailContentBase.dll
	UDTDetailContentBase/bin/Debug/UDTDetailContentBase.pdb
	UDTDetailContentBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	UDTDetailContentBase/obj/Debug/UDTDetailContentBase.csproj.GenerateResource.Cache
	UDTDetailContentBase/obj/Debug/UDTDetailContentBase.dll
	UDTDetailContentBase/obj/Debug/UDTDetailContentBase.pdb