'1'

jkt-admin/src/main/java/com/miaxis/pc/controller/vip/VipCodeController.java

@@ -64,10 +64,10 @@ public class VipCodeController extends BaseController{
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<VipCode> list(@ModelAttribute QueryVipCodeListDTO dto){
+    public ResponsePageInfo<VipCode> list(QueryVipCodeListDTO dto){
         startPage();
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        dto.setAgentId(user.getUserId()==1l? null: user.getUserId());
+        dto.setAgentId(user.getUserId()==1l? dto.getAgentId(): user.getUserId());
         List<VipCode> list = vipCodeService.selectVipCodeList(dto);
         return toResponsePageInfo(list);
     }

jkt-service/src/main/java/com/miaxis/vip/dto/QueryVipCodeListDTO.java

@@ -49,8 +49,6 @@ public class QueryVipCodeListDTO extends BaseBusinessEntity{
 //    @JsonFormat(pattern="yyyyMMdd",timezone = "GMT+8")
     private String endTime;
 
-    @Excel(name = "代理商id")
-    @TableField("agent_id")
     @ApiModelProperty(value = "代理商id")
     private Long agentId;