# Conflicts:
#	application/api_broker/controller/User.php
#	application/api_broker/service/DailyPaperService.php
#	application/app_broker/view/index/daily_achieve_mdzj.html
#	application/index/service/OfficeRoomService.php
#	application/index/service/UserService.php
#	application/index/view/finance/account_statement.html
#	application/index/view/finance/refundList.html
#	public/app/js/daily_achieve_mdzj.js
#	public/resource/js/getCollectionShop.js