Merge branch 'dev-wxl' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai

src/main/resources/mapper/template/HouseOrderMapper.xml

@@ -344,7 +344,7 @@
           AND FIND_IN_SET(order_status,'1,2,3,4')
           AND reserve_user_id=#{userId}
           AND #{dateTime} >= reserve_live_time
-          AND reserve_leave_time >= #{dateTime}
+          AND reserve_leave_time > #{dateTime}
           AND source=#{source}
           AND pay_price=0
     </select>