diff --git a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java index f7a60963..01a4c3b4 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java @@ -36,12 +36,15 @@ public class PageBuyerController { public ResultMessage getIndex(@RequestParam String clientType) { PageDataDTO pageDataDTO = new PageDataDTO(PageEnum.INDEX.name()); pageDataDTO.setPageClientType(clientType); - return ResultUtil.data(pageService.getPageData(pageDataDTO)); + PageDataVO pageDataVO=pageService.getPageData(pageDataDTO); + return ResultUtil.data(pageDataVO); } @ApiOperation(value = "获取页面数据") @GetMapping public ResultMessage get(PageDataDTO pageDataDTO) { - return ResultUtil.data(pageService.getPageData(pageDataDTO)); + + PageDataVO pageDataVO=pageService.getPageData(pageDataDTO); + return ResultUtil.data(pageDataVO); } } diff --git a/config/application.yml b/config/application.yml index 327cf008..1fb69c6f 100644 --- a/config/application.yml +++ b/config/application.yml @@ -69,7 +69,7 @@ spring: default-datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.116:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.0.116:3306/shengxing?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: lilishop maxActive: 50 diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java index 46e10907..230709a2 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java @@ -58,4 +58,7 @@ public class StoreBasicInfoVO { @ApiModelProperty(value = "udesk标识") private String merchantEuid; + @ApiModelProperty + private String pageShow; + }