Merge branch 'zyj-fixbug1021020' into 'master'

fixbug

See merge request rays/pcloud-book!457

pcloud-service-book/src/main/resources/mapper/push/SelfPushItemMapper.xml

@@ -130,7 +130,10 @@
     WHERE
     1 = 1
     <if test="startTime != null and endTime != null">
-      AND i.send_time BETWEEN #{startTime} AND #{endTime}
+      AND (
+      (i.send_time BETWEEN #{startTime} AND #{endTime} )
+      OR (p.start_time >= #{startTime} AND p.end_time &lt;= #{endTime})
+      )
     </if>
     <if test="pushStatus != null">
       AND i.push_status = #{pushStatus}