Revert "合并两种侧滑菜单"

This reverts commit b2a75eeb86debf537f338177d4c10edec3d995be.
Revert "Revert "合并两种侧滑菜单""

This reverts commit 21047d2f9429283a7b825beacf6017e8c5994c76.
v4�
Merge remote-tracking branch 'origin/master' into Test