Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

src/main/resources/com/steerinfo/dil/mapper/WmspGridMaterialMapper.xml

@@ -417,7 +417,7 @@
   
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <select id="selectGridMaterial" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+  <select id="selectGridMaterial" resultType="java.util.Map" parameterType="java.util.Map">
     select distinct *
     from (select
     RW.WAREHOUSE_NAME "warehouseName",

src/main/resources/com/steerinfo/dil/mapper/WmspOutboundResultMapper.xml

@@ -564,7 +564,7 @@
     ORDER BY ckd.RESULT_STATUS
   </select>
   
-  <select id="selectOutResult" resultType="java.util.Map">
+  <select id="selectOutResult" resultType="java.util.Map" parameterType="java.util.Map">
     SELECT
     DISTINCT
     ckd.RESULT_NUMBER "resultNumber",