From 29d330f60667cb479058cd640049dd6720eb5c87 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 二月 2024 17:01:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 6ae6492..270d249 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1131,7 +1131,7 @@
         if(null == uid){
             return ResultUtil.tokenErr();
         }
-        List<Income> objectId = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid));
+        List<Income> objectId = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid).eq("type",1));
         double sum =  0;
         for (Income income : objectId) {
             Double money = income.getMoney();

--
Gitblit v1.7.1