Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

yuan

2026-05-20 d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1

 src/main/resources/vm/xml/mapper.xml.vm

@@ -70,7 +70,7 @@
    </select>

#if($table.sub)



    <select id="select${subClassName}List" resultType="${subClassName}" resultMap="${subClassName}Result">

    <select id="select${subClassName}List" resultMap="${subClassName}Result">

        select#foreach ($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end

        from ${subTableName}

        where ${subTableFkName} = #{${subTableFkName}}