From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UserService/src/main/java/com/java110/user/smo/impl/OrgStaffRelInnerServiceSMOImpl.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/UserService/src/main/java/com/java110/user/smo/impl/OrgStaffRelInnerServiceSMOImpl.java b/UserService/src/main/java/com/java110/user/smo/impl/OrgStaffRelInnerServiceSMOImpl.java
index fcec871..ff4300d 100644
--- a/UserService/src/main/java/com/java110/user/smo/impl/OrgStaffRelInnerServiceSMOImpl.java
+++ b/UserService/src/main/java/com/java110/user/smo/impl/OrgStaffRelInnerServiceSMOImpl.java
@@ -5,7 +5,6 @@
 import com.java110.core.smo.org.IOrgStaffRelInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.UserDto;
 import com.java110.dto.org.OrgStaffRelDto;
 import com.java110.user.dao.IOrgStaffRelServiceDao;
 import com.java110.utils.util.BeanConvertUtil;
@@ -13,7 +12,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

--
Gitblit v1.8.0