mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-07-19 05:27:59 +08:00
Merge branch 'dev' of codeup.aliyun.com:67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev
# Conflicts: # jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
This commit is contained in:
@@ -132,13 +132,13 @@ public class MemberBasicInfoController extends BaseController {
|
||||
/**
|
||||
* 获取会员基础信息详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('member:memberGroup:list')")
|
||||
@PreAuthorize("@ss.hasPermi('member:info:query')")
|
||||
@GetMapping(value = "/{memberId}")
|
||||
public AjaxResult getInfo(@PathVariable("memberId") String memberId) {
|
||||
return AjaxResult.success(memberBasicInfoService.queryMemberInfoByMemberId(memberId));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('member:memberGroup:list')")
|
||||
@PreAuthorize("@ss.hasPermi('member:info:query')")
|
||||
@GetMapping(value = "/getMemberPersonPileInfo/{memberId}")
|
||||
public AjaxResult getMemberPersonPileInfo(@PathVariable("memberId") String memberId) {
|
||||
return AjaxResult.success(memberBasicInfoService.getMemberPersonPileInfo(memberId));
|
||||
|
||||
@@ -477,6 +477,7 @@ public class PileStationInfoController extends BaseController {
|
||||
* 根据站点获取已绑定停车平台配置
|
||||
*
|
||||
* @param stationId 站点ID
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/getParkingConfigByStationId/{stationId}")
|
||||
@@ -499,7 +500,4 @@ public class PileStationInfoController extends BaseController {
|
||||
return response;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// public AjaxResult checkStationAmap
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user