Merge remote-tracking branch 'origin/linshidesc' into uat

suishenbang-system/src/main/resources/mapper/system/AlertConfigurationMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectAlertConfigurationList" parameterType="AlertConfiguration" resultMap="AlertConfigurationResult">
         <include refid="selectAlertConfigurationVo"/>
-        <where>  
+        where 1=1
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
             <if test="alertContent != null  and alertContent != ''"> and alert_content like concat('%', #{alertContent}, '%')</if>
             <if test="alertStartTime != null "> and alert_start_time &gt;= #{alertStartTime}</if>
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alertNum != null "> and alert_num = #{alertNum}</if>
             <if test="userType != null  and userType != ''"> and user_type = #{userType}</if>
             <if test="alertStatus != null  and alertStatus != ''"> and alert_status = #{alertStatus}</if>
-        </where>
+        order by create_time desc
     </select>
 
     <select id="selectAlertConfigurationListFilter" parameterType="Long" resultMap="AlertConfigurationResult">