Merge branch 'refs/heads/dev' into dev_WMS20260401

# Conflicts:
#	mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java

mhd_wms/src/main/resources/mapper/receiptOrderAccount/ReceiptOrderAccountMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mhd.wms.domain.receiptOrderAccount.repository.mapper.ReceiptOrderAccountMapper">
+
+</mapper>

mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml

@@ -200,10 +200,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.status = #{status}
         </if>
         <if test="ltStatus != null ">
-            and a.status &lt; #{status}
+            and a.status &lt; #{ltStatus}
         </if>
         <if test="gtStatus != null ">
-            and a.status &gt; #{status}
+            and a.status &gt; #{gtStatus}
         </if>
         <if test="auditStatus != null ">
             and a.audit_status = #{auditStatus}