combined shen and yang
add papa and Chu
Merge branch '0318_sqlite3_wentong' of https://github.com/guoguo616/app into 0318_sqlite3_wentong
database convert, lacking date