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

This commit is contained in:
王奎兴
2026-02-28 16:25:39 +08:00
@@ -94,7 +94,7 @@
from settlement_customers
where del_flag = 1
<include refid="common_where"/>
ORDER BY create_time DESC
ORDER BY create_time IS NULL, create_time DESC
</select>
<select id="querySettlementObjects"
resultType="com.mhd.bms.domain.settlementCustomers.repository.po.SettlementCustomersPO">