|
|
@@ -97,7 +97,7 @@ public class DatabaselinkController {
|
|
|
.select(Databaselink.class,x -> VoToColumnUtil.fieldsToColumns(DatabaselinkPageVo.class).contains(x.getProperty()));
|
|
|
List<Databaselink> databaseLinkList = databaselinkService.list(queryWrapper);
|
|
|
List<DatabaseLinkListVo> resultList = new ArrayList<>();
|
|
|
-// resultList.add(BeanUtil.toBean(masterInfo().getData(), DatabaseLinkListVo.class));
|
|
|
+ resultList.add(BeanUtil.toBean(masterInfo().getData(), DatabaseLinkListVo.class));
|
|
|
resultList.addAll(BeanUtil.copyToList(databaseLinkList, DatabaseLinkListVo.class));
|
|
|
return R.ok(resultList);
|
|
|
}
|