Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 44127187247ab653f2bb2d542a2e08e8994774a5

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -11,7 +11,6 @@
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 com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -1471,6 +1470,7 @@
        return userService.resetPassExpertOrIndustryCenter(account,password);
    }


    @GetMapping("/accept")
    public R accept(@RequestParam("userId")Long userId){
        return userService.accept(userId);
@@ -1481,11 +1481,5 @@
        return userService.addComPbCheckUser(comPbCheckUserDTO);
    }

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

}