Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-11-03 8bf400b67418a4a81185a4a302fdbdfce2cdf018

 server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java

@@ -93,9 +93,9 @@
    public static  String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
        String title = "计费规则：";
        if(baseTime < 0){
            title = (basePrice.divide(new BigDecimal(100))).doubleValue()+"元畅骑一整天";
            title += (basePrice.divide(new BigDecimal(100))).doubleValue()+"元畅骑一整天";
        }else {
            title = "起步";
            title += "起步";
            int time = baseTime / 60;
            int min = baseTime % 60;
            if(time > 0){