From f604f87781d7cdae5571465a3bafffff53313028 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 08:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
index 1a421f9..ef3ac5f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.service.IService;
import org.springframework.ui.Model;
+import java.io.File;
import java.util.List;
import java.util.Map;
@@ -46,10 +47,10 @@
/**
* 聚合ocr识别
- * @param imgUrl
+ * @param file
* @return
*/
- JSONObject ocr(String imgUrl);
+ JSONObject ocr(File file);
/**
* 新增修改处理数据
@@ -78,7 +79,7 @@
* @param tDriverId
* @param model
*/
- void driverCommissionDetail(Integer tDriverId, Model model);
+ void driverCommissionDetail(Integer tDriverId,Integer levelFlag, Model model);
/**
* 统计司机数
--
Gitblit v1.7.1