From 84e740f362d574b942b1c9a274425841c9167de8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Nov 2023 08:27:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/controller/AllocationController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index aa33336..86f968a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -8,6 +8,7 @@
 import org.apache.commons.collections4.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.moral.api.entity.AllocationLog;
+import com.moral.api.pojo.enums.SysDictTypeEnum;
 import com.moral.api.pojo.ext.allocation.AllocationExt;
 import com.moral.api.pojo.ext.allocation.AllocationPageExt;
 import com.moral.api.pojo.query.allocation.*;

--
Gitblit v1.8.0