hzh-dataadapter
Merge commit '00b03b5097f15b6fd0798578c132e600faeaeed5'