Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4

ym-packing/src/main/java/com/cnbm/packing/mapper/ChangePackagingBoxHistoryMapper.java

@@ -6,6 +6,7 @@ import com.cnbm.packing.entity.ChangePackagingBoxHistory;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 包装箱拆合箱历史表
@@ -16,6 +17,6 @@ import java.util.List;
 @Mapper
 public interface ChangePackagingBoxHistoryMapper extends BaseDao<ChangePackagingBoxHistory> {
 
-    List<ChangePackagingBoxHistoryDTO> list();
+    List<ChangePackagingBoxHistoryDTO> list(Map<String, Object> params);
     
 }