# This is a combination of 2 commits.
# The first commit's message is:

重构Models

# This is the 2nd commit message:

调整model的写法