Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging

This commit is contained in:
Linksehat Staging Server
2023-07-26 17:04:17 +07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -60,7 +60,7 @@ class CorporateMemberController extends Controller
]); ]);
} }
]) ])
->groupBy('members.id') ->groupBy('members.id','members.person_id')
->paginate() ->paginate()
->appends($request->all()); ->appends($request->all());
return Helper::paginateResources(MemberDataTableResource::collection($members)); return Helper::paginateResources(MemberDataTableResource::collection($members));

View File

@@ -79,7 +79,7 @@ export default function Dashboard() {
} }
}) })
setItemList(dummyData); //setItemList(dummyData);
} }
return ( return (