Merge branch 'dev-zza' into dev

jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java

@@ -84,6 +84,8 @@ public class PileController extends BaseController {
                 List<String> deptIds = pileMerchantInfoService.getDeptIdsByAppId(appId);
                 queryStationDTO.setMerchantDeptIds(deptIds);
             }
+            // 获取memberId
+            queryStationDTO.setMemberId(getMemberIdByAuthorization(request));
             logger.debug("uniApp查询充电站信息appId:{}, dto:{}", appId, JSON.toJSONString(queryStationDTO));
             PageResponse pageResponse = pileStationInfoService.uniAppQueryStationInfoList(queryStationDTO);
             response = new RestApiResponse<>(pageResponse);