Merge branch ‘zhangyuanliang_branch’ into ‘master’

新增图

See merge request !26