Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -393,8 +393,8 @@
                 AND tpp.make_time = #{makeTime}
             </if>
             <if test="makeTimeStart != null and makeTimeEnd != null">
-                AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
-                AND t.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
+                AND tpp.make_time &gt;= #{makeTimeStart}::timestamp with time zone
+                AND tpp.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
             </if>
             <if test="flgValid != null">
                 AND tpp.flg_valid = #{flgValid}