diff --git a/gringotts-frontend/pages/index/tab-market.js b/gringotts-frontend/pages/index/tab-market.js index e93dc09..07af0b1 100644 --- a/gringotts-frontend/pages/index/tab-market.js +++ b/gringotts-frontend/pages/index/tab-market.js @@ -28,13 +28,10 @@ export function tabMarket() { payload.data = payload.data.map(i => { return { ...i, - targetId: i.id + targetId: i.resourceId, } }) - console.log(payload, response, api, context) - return { - ...payload - } + return payload } }, ...crudCommonOptions(), diff --git a/gringotts-frontend/pages/index/tab-permissions.js b/gringotts-frontend/pages/index/tab-permissions.js index ffcbb51..d6eaae8 100644 --- a/gringotts-frontend/pages/index/tab-permissions.js +++ b/gringotts-frontend/pages/index/tab-permissions.js @@ -27,7 +27,7 @@ export function tabPermissions() { return { visibleOn: userOnly, title: '权属管理', - icon: 'fa fa-user-shield', + icon: 'fa fa-key', reload: true, body: { type: 'tabs', diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/WareController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/WareController.java index 9a6fd42..0539c76 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/WareController.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/WareController.java @@ -43,7 +43,7 @@ public class WareController extends SimpleControllerSupport> listPublic() throws Exception { + public AmisResponse> listPublic() { return AmisResponse.responseSuccess(wareService.listPublic().collect(this::toListItem)); } @@ -79,6 +79,7 @@ public class WareController extends SimpleControllerSupport