Merge branch 'master-v2' of http://47.96.225.205:8888/r/flowerbackend-v2 in...

Cui Zhi Feng

2024-08-29 a3d54f0b768aca492e9a9f4689b3a4ec8234381e

 src/main/java/com/mzl/flower/service/BaseService.java

@@ -459,6 +459,16 @@
        return p;
    }

    protected Customer getCustomer(Long id){
        Customer p = customerMapper.selectById(id);

        if(p == null){
            throw new ValidationException("商户不存在");
        }

        return p;
    }

    public Partner getCurrentPartner(){
        String userId = SecurityUtils.getUserId();
        Partner p = partnerMapper.selectOne(new QueryWrapper<Partner>()