|  | @@ -80,7 +80,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      @GetMapping("/list")
 | 
	
		
			
				|  |  |      public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
 | 
	
		
			
				|  |  | -                              String consignee
 | 
	
		
			
				|  |  | +                              String consignee, Long itemCreateId, Long collectSampleId
 | 
	
		
			
				|  |  |      ) {
 | 
	
		
			
				|  |  |          TableDataInfo tableDataInfo = new TableDataInfo();
 | 
	
		
			
				|  |  |          try {
 | 
	
	
		
			
				|  | @@ -122,6 +122,12 @@ public class KuaishouItemCollectSamplesController extends BaseController {
 | 
	
		
			
				|  |  |              if (!Check.isNull(consignee)) {
 | 
	
		
			
				|  |  |                  requestMap.put("consignee", consignee);
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  | +            if (!Check.isNull(itemCreateId)) {
 | 
	
		
			
				|  |  | +                requestMap.put("itemCreateId", itemCreateId);
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +            if (!Check.isNull(collectSampleId)) {
 | 
	
		
			
				|  |  | +                requestMap.put("collectSampleId", collectSampleId);
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  |              startPage();
 | 
	
		
			
				|  |  |              List<KuaishouItemCollectSamples> list = kuaishouItemCollectSamplesService.selectKuaishouItemCollectSamplesList(requestMap);
 | 
	
		
			
				|  |  |              return getDataTable(list);
 |