Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

@@ -1285,5 +1286,20 @@
     * 三说会堂重置密码
     * */
    @GetMapping("/sanshuoResetPassword")
    R sanShuoResetPassword(@RequestParam("id") Long userId,@RequestParam("pass")String password);
    R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);


    @GetMapping("/accept")
     R accept(@RequestParam("userId")Long userId);

    @PostMapping("/addComPbCheckUser")
     R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO);



    /**
     * 是否为专家登陆小程序
     * */
    @GetMapping("/isSanShuoExpert")
    R isExpert(@RequestParam("number") String number);
}