Merge remote-tracking branch 'origin/master'

guyue

2025-08-01 0f79643e35af90cb63a4b3c67ee72abfe0e37770

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

@@ -157,6 +157,7 @@
                
                serverCarModelWarpper.setContentExclusive(contentExclusive);
                serverCarModelWarpper.setContentPrice(contentPrice);
                serverCarModelWarpper.setWaitPrice(jsonObject);
                
                serverCarModelWarpper.setAmount(this.calculationPrice(contentExclusive, distance, duration, wait, waitMoney));
                serverCarModelWarpper.setBuyNowAmount(this.calculationPrice(contentPrice, distance, duration, wait, waitMoney));
@@ -296,7 +297,7 @@
        serverCarModelWarpper.setContentNotTwo(new JSONObject());
        serverCarModelWarpper.setContentPutThree(new JSONObject());
        serverCarModelWarpper.setContentNotThree(new JSONObject());
        serverCarModelWarpper.setContentExclusive(new JSONObject());
        serverCarModelWarpper.setContentExclusive(jsonObject);
        serverCarModelWarpper.setContentPrice(new JSONObject());
        
        return serverCarModelWarpper;