From 5eb88939c094fac1f5dc9201b5af6da4165cc185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationService.java b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
index 680e161..c610ced 100644
--- a/screen-api/src/main/java/com/moral/api/service/AllocationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -19,15 +19,15 @@
List<Map<String, Object>> sysDictData(String code);
- List<ResponsibilityUnit> seleteUnit();
-
Integer insertAllocation(AllocationAddCond allocation);
-
- AllocationUnitDto check(Integer id);
void updateAll(AllocationUpdateCond allocationUpdateCond);
- List<Allocation> selectAll(Map<String,Object> map);
+ List<Integer> unitResult();
+
+ Map<String, Object> selectUnitView(Map<String,Object> map);
+
+ List<Map<String,Object>> unitExel(Map<String,Object> map);
Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond);
/**
--
Gitblit v1.8.0