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

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

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