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

railway-business/src/main/resources/mapper/push/BusPushMsgMapper.xml

@@ -166,10 +166,10 @@
                 and ios_alert_msg=#{iosAlertMsg}
             </if>
             <if test="createTime!=null">
-                and DATE_FORMAT(t.create_time, '%Y-%m-%d') = #{createTime}
+                and DATE_FORMAT(create_time, '%Y-%m-%d') = #{createTime}
             </if>
             <if test="pushTime!=null">
-                and DATE_FORMAT(t.push_time, '%Y-%m-%d') = #{pushTime}
+                and DATE_FORMAT(push_time, '%Y-%m-%d') = #{pushTime}
             </if>
             <if test="pushStatus!=null and pushStatus!=''">
                 and push_status=#{pushStatus}
@@ -181,6 +181,7 @@
                 and push_loop=#{pushLoop}
             </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectAppMsg" resultMap="BaseResultMap">