目录整合
Signed-off-by: zhmwang2008 <zhmwang2008@126.com>