Merge remote-tracking branch 'origin/master'

lyh

2025-05-08 85e36a5016633748bbd76bb4ddaef49566a505d5

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/WarehouseMapper.xml

@@ -2,4 +2,24 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tms.mapper.WarehouseMapper">

    <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.Warehouse">
        SELECT
            t.id,
            t.warehouse_id warehouseId,
            t.warehouse_name warehouseName,
            t.parent_id parentId,
            p.warehouse_id parentWarehouseId,
            p.warehouse_name parentWarehouseName,
            t.seq,
            t.leaf_flag leafFlag,
            t.status,
            t.remark,
            t.create_by createBy,
            t.create_time createTime,
            t.update_by updateBy,
            t.update_time updateTime
        FROM tms_warehouse t
        LEFT JOIN tms_warehouse p on t.parent_id = p.id
        ${ew.customSqlSegment}
    </select>
</mapper>