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

zhibing.pu

2024-05-27 f9b9131367d9ba6fe852130b12083c0f5ea68bbb

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java

@@ -7,6 +7,7 @@
import com.stylefeng.guns.modular.system.service.IIncomeService;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -61,4 +62,6 @@
    public List<Map<String, Object>> getTotal(String times) {
        return this.baseMapper.getTotal(times);
    }


}