From a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 13 五月 2021 13:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 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 b705de7..cb73e7f 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
@@ -2439,6 +2439,22 @@
     R editvillage(@PathVariable("villageId") Long villageId,@RequestBody ComMngVillageVO comMngVillageVO);
 
     /**
+     * 商城系统配置
+     * @param comShopSysConfDTO
+     * @return
+     */
+    @PostMapping("/shop/conf/edit")
+    R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO);
+
+    /**
+     * 商城系统配置查询
+     * @param pageComShopSysConfDTO
+     * @return
+     */
+    @PostMapping("/shop/conf/get")
+    R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO);
+
+    /**
      * 编辑实有人口_电子档案
      * @param userElectronicFileVO
      * @return

--
Gitblit v1.7.1