小改动
Signed-off-by: xiyuchuanshuo <511263942@qq.com>
Merge branch 'zhangkuoyu_5.5' of https://github.com/xiyuchuanshuo/BeiyuanYujing.git into shaolijuan_5.5

Conflicts:
	src/com/beiyuan/appyujing/data/Constant.java
	src/com/beiyuan/appyujing/service/UrlService.java
	src/com/beiyuan/appyujing/service/UrlServiceImpl.java