Merge branch 'master' into dev

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml

@@ -100,7 +100,7 @@
          LEFT JOIN  tour_good_site s   on v.site_id=s.id
          LEFT JOIN  tour_good_spe_price p ON v.spe_id=p.id
          WHERE
-         v.is_del = 0 and v.good_id=#{goodId} and DATEDIFF(p.start_time,NOW())>0
+         v.is_del = 0 and v.good_id=#{goodId} <!--and DATEDIFF(p.start_time,NOW())>0-->
          <if test="siteId!=null and siteId!='' ">
              and v.site_id=#{siteId}
          </if>