diff --git a/src/main/resources/templates/generator/mapper.xml.vm b/src/main/resources/templates/generator/mapper.xml.vm
index 28fb787e..0c874c84 100644
--- a/src/main/resources/templates/generator/mapper.xml.vm
+++ b/src/main/resources/templates/generator/mapper.xml.vm
@@ -36,15 +36,24 @@
                 <if test="queryParams.${fieldConfig.fieldName}.size() > 0">
                     AND ${fieldConfig.columnName} IN  <foreach collection="queryParams.${fieldConfig.fieldName}" item="item" open="(" close=")" separator=",">#{item}</foreach>
                 </if>
-                            #elseif($queryType == "BETWEEN")
+                #elseif($queryType == "BETWEEN")
+                    #if($fieldConfig.formType == "DATE" || $fieldConfig.formType == "DATE_TIME")
                 <if test="queryParams.${fieldConfig.fieldName}[0] != null and queryParams.${fieldConfig.fieldName}[0] != ''">
                     <bind name="startDate" value="queryParams.${fieldConfig.fieldName}[0].length() == 10 ? queryParams.${fieldConfig.fieldName}[0] + ' 00:00:00' : queryParams.${fieldConfig.fieldName}[0]"/>
-                    AND u.create_time &gt;= #{startDate}
+                    AND ${fieldConfig.fieldName} &gt;= #{startDate}
                 </if>
                 <if test="queryParams.${fieldConfig.fieldName}[1] != null and queryParams.${fieldConfig.fieldName}[1] != ''">
                     <bind name="endDate" value="queryParams.${fieldConfig.fieldName}[1].length() == 10 ? queryParams.${fieldConfig.fieldName}[1] + ' 23:59:59' : queryParams.${fieldConfig.fieldName}[1]"/>
-                    AND u.create_time &lt;= #{endDate}
+                    AND ${fieldConfig.fieldName} &lt;= #{endDate}
                 </if>
+                    #else
+                <if test="queryParams.${fieldConfig.fieldName}[0] != null and queryParams.${fieldConfig.fieldName}[0] != ''">
+                    AND ${fieldConfig.fieldName} &gt;= #{queryParams.${fieldConfig.fieldName}[0]}
+                </if>
+                <if test="queryParams.${fieldConfig.fieldName}[1] != null and queryParams.${fieldConfig.fieldName}[1] != ''">
+                    AND ${fieldConfig.fieldName} &lt;= #{queryParams.${fieldConfig.fieldName}[1]}
+                </if>
+                    #end
                             #elseif($queryType == "GT")
                 AND ${fieldConfig.columnName} > #{queryParams.${fieldConfig.fieldName}}
                             #elseif($queryType == "GE")