Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

 ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -31,8 +31,8 @@
    <select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}"
            resultMap="${ClassName}Result">
        <include refid="select${ClassName}Vo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag=0
            #foreach($column in $columns)
                #set($queryType=$column.queryType)
                #set($javaField=$column.javaField)
@@ -75,7 +75,6 @@
                    #end
                #end
            #end
        </where>
    </select>

    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}"