完善userTask的转换。
Merge remote-tracking branch 'origin/develop' into develop