Merge remote-tracking branch 'origin/master'

zzw

2023-11-28 7748cd8a79548e94299d24e080c4650924a215da

 modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml

@@ -8,8 +8,8 @@
        from warehouse_cm_audit a
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            <if test="warehouseId!=null">
                and warehouse_id = ${warehouseId}
            </if>
        </where>
        <if test="orderBySql!=null">