From 221b72ce4da14b97dc5aa5afe43eae2c68fb88b0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 18 七月 2025 20:53:21 +0800
Subject: [PATCH] Merge branch 'huliguo' of http://120.76.84.145:10101/gitblit/r/java/ZhengShengXinAdmin into huliguo
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java
index acb24a9..cd4b7a6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderServiceImpl.java
@@ -177,6 +177,8 @@
company.setPaidInFunds(jsonObject.getString("PaidUpCapital"));
companyMapper.updateById(company);
BeanUtils.copyProperties(company, vo);
+ vo.setNewRegisteredCapital(company.getRealRegisteredCapital());
+ vo.setPlace(company.getCity()+company.getProvince()+company.getArea());
JSONObject area = (JSONObject) jsonObject.get("Area");
vo.setPlace(area.getString("Province")+"-"+area.getString("City")+"-"+area.getString("County"));
@@ -764,7 +766,8 @@
@Override
public FinanceFlowsTopVO financeTop(FinanceFlowsDTO dto) {
- return this.baseMapper.financeTop(dto);
+ FinanceFlowsTopVO financeFlowsTopVO = this.baseMapper.financeTop(dto);
+ return financeFlowsTopVO;
}
@Override
--
Gitblit v1.7.1