asdadsdfsd
Merge branch 'chen' of https://github.com/mAsCuLiNe/ooplatingsistm into chen

merge sfjsdlfjsdl
part 4 code finish