Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-04 1c14ed902b327f8add38dac4311acd2894aea5e1

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java

@@ -97,8 +97,10 @@
        first = baseWarppers.stream().filter(s->s.getId() == 2).findFirst();
        if(first.isPresent()){
            serverCarModelWarpper = this.getTextPrice(query.getId(), distance1_, duration_, 0, 2, geocode);
            if(serverCarModelWarpper!=null){
            price.add(serverCarModelWarpper);
        }
        }
        return ResultUtil.success(price);
    }