merge form hwjworld/xiaodun-platform