Merge branch 'developer' into 'master'

添加会员卡的数据

See merge request !28

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.java

@@ -70,6 +70,7 @@ public class ConsumeStructureController {
     @RequestMapping("get-age-consume-group")
     public RestResponse listAgeConsumeGroup(AgeConsumeAreaQO params) {
         log.info("消费构成-消费年龄-年龄段参数：{}", JSON.toJSONString(params));
+        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         return ResultControllerUtils.commonResult(consumeStructureApiService.listAgeConsumeGroup(params));
     }