修改server查询接口
Merge branch 'master' of https://github.com/Patrick-Wang/BlueRay

Conflicts:

	Src/BlueLightSPS_Web/BlueRay/src/java/com/BlueRay/mutton/controller/SaleController.java

	Src/BlueLightSPS_Web/BlueRay/src/java/com/BlueRay/mutton/model/dao/SaleDao.java

	Src/BlueLightSPS_Web/BlueRay/src/java/com/BlueRay/mutton/model/dao/SaleDaoImpl.java

	Src/BlueLightSPS_Web/BlueRay/src/java/com/BlueRay/mutton/service/SaleServiceImpl.java