From 6712b6d4d3bd39713d387fead75b7d65f8d157c2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 27 Sep 2023 19:02:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 9 +++++++++
1 files changed, 9 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..1d5a924 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,13 @@
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);
/**
* ������id������������
@@ -37,6 +44,8 @@
*/
AllocationExt extOne(Integer id);
+ AllocationExt oneAllocation(Integer id);
+
void changeAllocation(AllocationChangeCond changeCond);
void checkAllocation(AllocationCheckCond checkCond);
--
Gitblit v1.8.0