java/zhihuishenqu.git

			@@ -29,11 +29,13 @@
			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;
			import org.springframework.web.bind.annotation.*;

			import javax.validation.Valid;
			import java.util.List;

			/**
			@@ -758,7 +760,7 @@
			*
			* @return
			*/
			@PostMapping("timedtaskactmicrowishall")
			@PostMapping("timedtaskactmicrowish")
			R timedTaskActMicroWishAll();

			/**
			@@ -2386,7 +2388,7 @@
			* 邻里圈评论回复_基本详情
			* @param id 参数
			*/
			@PostMapping("/neighbor/detailNeighborCommentReply")
			@GetMapping("/neighbor/detailNeighborCommentReply")
			R detailNeighborCommentReply(@RequestParam("id") Long id);

			/**
			@@ -2427,4 +2429,36 @@
			@PostMapping("/neighbor/neighborCommentReplyByApp")
			R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO);

			/**
			* 实有房屋_编辑
			* @param villageId 实有房屋id
			* @param comMngVillageVO 请求参数
			* @return
			*/
			@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);
			}