Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

zhang

2025-08-01 b1cbb59d39cea44d35110d95e54fbd86d4a12e13

 src/main/resources/mapper/OrderMapper.xml

@@ -127,6 +127,9 @@
        where
            mo.doc_type = 21
          and mo.settle in(1, 2)
        <if test="orderNo != ''">
            and mo.order_no = #{orderNo}
        </if>
        GROUP BY
            mo.order_no
    </select>