java/zhihuishenqu.git

			@@ -10590,7 +10590,7 @@

			@GetMapping("/sanshuo/expert/backstageList2")
			R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
			@RequestParam(value = "size",required = false)Integer size);
			@RequestParam(value = "size",required = false)Integer size,@RequestParam(value = "keyWord",required = false)String keyWord);

			/**
			* 查询社区id集合
			@@ -10667,7 +10667,7 @@
			* @param convenientGoodsCategoryDTO
			* @return
			*/
			@PostMapping("/goodsCategory/add")
			@PostMapping("/convenient/goodsCategory/add")
			R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

			/**
			@@ -10675,7 +10675,7 @@
			* @param convenientGoodsCategoryDTO
			* @return
			*/
			@PutMapping("/goodsCategory/put")
			@PutMapping("/convenient/goodsCategory/put")
			R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);

			/**
			@@ -10683,7 +10683,7 @@
			* @param categoryId
			* @return
			*/
			@DeleteMapping("/goodsCategory/delete")
			@DeleteMapping("/convenient/goodsCategory/delete")
			R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

			/**
			@@ -10691,7 +10691,7 @@
			* @param categoryId
			* @return
			*/
			@GetMapping("/goodsCategory/get")
			@GetMapping("/convenient/goodsCategory/get")
			R getGoodsCategory(@RequestParam("categoryId") Long categoryId);

			/**
			@@ -10981,4 +10981,11 @@
			*/
			@GetMapping("/shopFlower/selectCountByDeliveryType")
			R selectCountByDeliveryType(Integer deliveryType);

			/**
			* 获取社区动态置顶banner
			* @param communityId 社区id
			* */
			@PostMapping("/easyphoto/getUserRewardsNew")
			R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
			}