From 2e3407d0b46a6e2e75f8cf14cce73f8e0ba2051e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 26 五月 2023 16:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java b/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
index 909eaaf..758bfb3 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
@@ -146,7 +146,7 @@
                 TCompanyResp tCompanyResp = new TCompanyResp();
                 tCompanyResp.setOrderId(order.getId());
                 tCompanyResp.setName(price.getType());
-                tCompanyResp.setPrice(price.getPrice());
+                tCompanyResp.setPrice(price.getCarPrice());
                 tCompanyRespList.add(tCompanyResp);
             }
             BigDecimal bigDecimal = tCompanyRespList.stream().map(TCompanyResp::getPrice).reduce(BigDecimal::add).orElse(new BigDecimal(0.00));

--
Gitblit v1.7.1