Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-13 a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -29,6 +29,7 @@
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
@@ -2436,4 +2437,28 @@
     */
    @PostMapping("/editvillage/{villageId}")
    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
     */
    @PostMapping("/common/data/population/edit/electronicArchives")
    R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO);
}