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

ym-packing/src/main/resources/mapper/ChangePackagingBoxHistoryMapper.xml

@@ -24,6 +24,14 @@
 
     <select id="list" resultType="com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO">
         select * from t_change_packaging_box_history
+        <where>
+            <if test="startTime != null and endTime != null">
+                and create_time BETWEEN #{startTime} AND #{endTime}
+            </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
+        </where>
         order by id asc
     </select>