我的绩效总结主界面
Merge branch 'MacIvan'
Merge branch 'master' of staffonly.zhisiyun.com:nick/zhisiyun-mobile
增加上传照片的水印功能
 Merge branch 'nick' into 'master'

Nick