From fd68d9efbe525e9210f7013c1f103f197f01841c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 26 Sep 2023 15:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 2d6b44d..8fb6916 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
@@ -29,6 +29,11 @@
List<Allocation> selectAll(Map<String,Object> map);
+
+ Map<String, Object> selectUnitView(Map<String,Object> map);
+
+ List<Map<String,Object>> unitExel(Map<String,Object> map);
+
Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond);
/**
* ������id������������
@@ -37,6 +42,8 @@
*/
AllocationExt extOne(Integer id);
+ AllocationExt oneAllocation(Integer id);
+
void changeAllocation(AllocationChangeCond changeCond);
void checkAllocation(AllocationCheckCond checkCond);
--
Gitblit v1.8.0