Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into haucheng_panzhihua