Merge remote-tracking branch 'origin/master'

zhs

昨天 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6

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

@@ -32,6 +32,7 @@
            resultMap="${ClassName}Result">
        <include refid="select${ClassName}Vo"/>
        <where>
            del_flag=0
            #foreach($column in $columns)
                #set($queryType=$column.queryType)
                #set($javaField=$column.javaField)