merge
this is delete
adapter delete
漏了一个
Merge branch 'AppFrame' into Shop-1.0