Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f

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

@@ -432,6 +432,7 @@
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.web.multipart.MultipartFile;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -10400,7 +10401,8 @@
    @GetMapping("/sanshuo/expert/backstageList")
    R backExpertList(@RequestParam(value = "keyWord",required = false)@ApiParam("搜索关键字") String keyWord,
                     @RequestParam(value = "page",required = false)Integer page,
                     @RequestParam(value = "size",required = false)Integer size);
                     @RequestParam(value = "size",required = false)Integer size,
                     @RequestParam(value = "level",required = false)Integer level);

    /**
     * 添加专家
@@ -10536,4 +10538,30 @@

    @GetMapping("/sanshuo/comEvent/streetList")
    R streetList();

    @PostMapping("/sanshuo/expert/importExpert")
    R importExpert(@RequestBody MultipartFile file);

    @GetMapping("/sanshuo/comEvent/communityList")
    R westList();

    @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);

    /**
     * 查询社区id集合
     * @param id
     * @return
     */
    @GetMapping("selectCommunityIds")
    R selectCommunityIds(@RequestParam("id") Long id);

    /**
     * 查询社区id集合
     * @param id
     * @return
     */
    @GetMapping("selectAutomessageSysUserById")
    R selectAutomessageSysUserById(@RequestParam("id") Long id);
}