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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 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}}