Merge branch 'master' into docker_package
This commit is contained in:
commit
7d390ae99b
|
@ -2874,7 +2874,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
|||
sb.append(" AND apply.\"resourceName\" LIKE '%" + params.get("resourceName").toString() + "%'");
|
||||
}
|
||||
sb.append(" ORDER BY apply.\"createDate\" DESC");
|
||||
List<Map<String, Object>> list = null;
|
||||
List<Map<String, Object>> list = new ArrayList<>();
|
||||
try {
|
||||
list = lcJdbcTemplate.queryForList(sb.toString());
|
||||
} catch (DataAccessException e) {
|
||||
|
|
Loading…
Reference in New Issue