cdhj 兼容
merge