Merge branch 'dev' of xiaoyunquan/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/radio/WlyyRadioService.java

@@ -40,7 +40,7 @@ public class WlyyRadioService {
        if(StringUtils.isNotBlank(frequency)){
            sql += " and frequency like '%"+frequency+"%' ";
        }
        String orderSql = " order by sort_num limit "+page*pageSize+","+pageSize;
        String orderSql = " order by sort_num desc limit "+page*pageSize+","+pageSize;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(colSql+sql+orderSql);
        String countSql = "SELECT count(*) ";
        Long count = jdbcTemplate.queryForObject(countSql+sql, Long.class);