Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

1 天以前 e7b0669ba01fec3623622a6a6da26b8017f0bc4f

 ruoyi-system/src/main/resources/mapper/system/TSysLiveMapper.xml

@@ -74,7 +74,12 @@
            </if>
            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY create_time DESC
        <if test="query.liveStatus == null">
            ORDER BY start_time
        </if>
        <if test="query.liveStatus != null">
            ORDER BY create_time DESC
        </if>
    </select>

</mapper>