From b4fd278f1d61f8d664c600397cc0f17564678131 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期六, 17 四月 2021 17:36:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java index 036d95c..52a40b9 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java @@ -1,6 +1,7 @@ package com.panzhihua.common.service.community; import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; +import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO; import com.panzhihua.common.model.dtos.community.*; @@ -12,6 +13,7 @@ import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo; import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO; import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO; +import com.panzhihua.common.model.vos.shop.ShopOperLogVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import org.springframework.cloud.openfeign.FeignClient; @@ -1795,6 +1797,20 @@ R getStoreInfo(@RequestParam("id")Long id); /** + * 结果 + * @param shopOperlog 商城后台操作日志 + */ + @PostMapping("/shop/addShopOperLog") + R addShopOperLog(@RequestBody ShopOperLogVO shopOperlog); + + /** + * 分页查询 商家后台操作日志 + * @param pageDTO 分页数据 + * @return 分页日志 + */ + @PostMapping("/shop/pageShopOperLog") + R pageShopOperLog(@RequestBody PageDTO pageDTO); + /** * 分页查询店铺列表 * @param comShopStoreDTO 请求参数 * @return 店铺列表 -- Gitblit v1.7.1