Merge remote-tracking branch 'origin/dev' into dev

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodSpeBiz.java

@@ -124,7 +124,8 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
             long startDateTime = dateFormat.parse(dateFormat.format(startTime)).getTime();
             long endDateTime = dateFormat.parse(dateFormat.format(endTime)).getTime();
-            if (startDateTime<=endDateTime){
+            log.info("----startDateTime==="+startDateTime+"----endDateTime===="+endDateTime);
+            if (startDateTime<endDateTime){
                 return  false;
             }
             int days=(int)((startDateTime - endDateTime) / (1000 * 3600 * 24));