冲突文件恢复

service-manager/src/main/java/com/winsun/controller/SalesListController.java

@@ -104,6 +104,7 @@ public class SalesListController extends BaseController{
 			@RequestParam("activateTimeStart") String activateTimeStart,@RequestParam("activateTimeEnd") String activateTimeEnd,
 			@RequestParam("activateTimeStart") String activateTimeStart,@RequestParam("activateTimeEnd") String activateTimeEnd,
 			@RequestParam(name = "pageNo", required = false) int pageIndex,
 			@RequestParam(name = "pageNo", required = false) int pageIndex,
 			@RequestParam(name = "pageSize", required = false) int pageSize){
 			@RequestParam(name = "pageSize", required = false) int pageSize){
+		System.out.println("");
 		Page<SalesList> page = new Page<>(pageIndex, pageSize);
 		Page<SalesList> page = new Page<>(pageIndex, pageSize);
 		Wrapper<SalesList> wrapperOrder = new EntityWrapper<SalesList>();
 		Wrapper<SalesList> wrapperOrder = new EntityWrapper<SalesList>();
 		wrapperOrder.eq(StringUtils.isNotBlank(orderPhone), "order_phone", orderPhone);
 		wrapperOrder.eq(StringUtils.isNotBlank(orderPhone), "order_phone", orderPhone);