|  | @@ -1,12 +1,10 @@
 | 
											
												
													
														|  |  package com.ym.mec.web.controller;
 |  |  package com.ym.mec.web.controller;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  import com.alibaba.fastjson.JSONArray;
 |  |  import com.alibaba.fastjson.JSONArray;
 | 
											
												
													
														|  | -import com.huifu.adapay.Adapay;
 |  | 
 | 
											
												
													
														|  |  import com.ym.mec.biz.dal.dao.SysConfigDao;
 |  |  import com.ym.mec.biz.dal.dao.SysConfigDao;
 | 
											
												
													
														|  |  import com.ym.mec.biz.dal.entity.HfMember;
 |  |  import com.ym.mec.biz.dal.entity.HfMember;
 | 
											
												
													
														|  | -import com.ym.mec.biz.dal.page.HfCompanyQueryInfo;
 |  | 
 | 
											
												
													
														|  | 
 |  | +import com.ym.mec.biz.dal.page.HfMemberQueryInfo;
 | 
											
												
													
														|  |  import com.ym.mec.biz.service.HfMemberService;
 |  |  import com.ym.mec.biz.service.HfMemberService;
 | 
											
												
													
														|  | -import com.ym.mec.biz.service.SysConfigService;
 |  | 
 | 
											
												
													
														|  |  import com.ym.mec.common.entity.HttpResponseResult;
 |  |  import com.ym.mec.common.entity.HttpResponseResult;
 | 
											
												
													
														|  |  import com.ym.mec.common.exception.BizException;
 |  |  import com.ym.mec.common.exception.BizException;
 | 
											
												
													
														|  |  import com.ym.mec.common.page.PageInfo;
 |  |  import com.ym.mec.common.page.PageInfo;
 | 
											
										
											
												
													
														|  | @@ -17,8 +15,6 @@ import com.ym.mec.thirdparty.adapay.Payment;
 | 
											
												
													
														|  |  import com.ym.mec.util.date.DateUtil;
 |  |  import com.ym.mec.util.date.DateUtil;
 | 
											
												
													
														|  |  import com.ym.mec.util.excel.POIUtil;
 |  |  import com.ym.mec.util.excel.POIUtil;
 | 
											
												
													
														|  |  import io.swagger.annotations.Api;
 |  |  import io.swagger.annotations.Api;
 | 
											
												
													
														|  | -import io.swagger.annotations.ApiImplicitParam;
 |  | 
 | 
											
												
													
														|  | -import io.swagger.annotations.ApiImplicitParams;
 |  | 
 | 
											
												
													
														|  |  import io.swagger.annotations.ApiOperation;
 |  |  import io.swagger.annotations.ApiOperation;
 | 
											
												
													
														|  |  import org.apache.commons.io.IOUtils;
 |  |  import org.apache.commons.io.IOUtils;
 | 
											
												
													
														|  |  import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 |  |  import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 | 
											
										
											
												
													
														|  | @@ -46,7 +42,7 @@ public class AdapayController extends BaseController {
 | 
											
												
													
														|  |      @ApiOperation(value = "企业用户列表")
 |  |      @ApiOperation(value = "企业用户列表")
 | 
											
												
													
														|  |      @GetMapping("/queryPage")
 |  |      @GetMapping("/queryPage")
 | 
											
												
													
														|  |      @PreAuthorize("@pcs.hasPermissions('adapay/queryPage')")
 |  |      @PreAuthorize("@pcs.hasPermissions('adapay/queryPage')")
 | 
											
												
													
														|  | -    public HttpResponseResult<PageInfo<HfMember>> queryPage(HfCompanyQueryInfo queryInfo) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public HttpResponseResult<PageInfo<HfMember>> queryPage(HfMemberQueryInfo queryInfo) {
 | 
											
												
													
														|  |          return succeed(hfMemberService.queryPage(queryInfo));
 |  |          return succeed(hfMemberService.queryPage(queryInfo));
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 |