From 4f1029f5b6ab4dcb326d65995477c6ec599c7a2b Mon Sep 17 00:00:00 2001
From: xzb <223@qq.com>
Date: Mon, 17 Oct 2022 14:45:01 +0800
Subject: [PATCH] paper

---
 .../joylink/rtss/services/paper/PaperCompositionService.java   | 3 +--
 .../{controller => vo}/paper/PaperCompositionWithRuleVo.java   | 2 +-
 src/main/java/club/joylink/rtss/vo/paper/PaperUserWholeVo.java | 1 -
 .../rtss/vo/paper/convertor/PaperCompositionConvertor.java     | 3 +--
 .../joylink/rtss/vo/paper/convertor/PaperRuleConvertor.java    | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)
 rename src/main/java/club/joylink/rtss/{controller => vo}/paper/PaperCompositionWithRuleVo.java (98%)

diff --git a/src/main/java/club/joylink/rtss/services/paper/PaperCompositionService.java b/src/main/java/club/joylink/rtss/services/paper/PaperCompositionService.java
index 256c256de..e6b333bcf 100644
--- a/src/main/java/club/joylink/rtss/services/paper/PaperCompositionService.java
+++ b/src/main/java/club/joylink/rtss/services/paper/PaperCompositionService.java
@@ -1,6 +1,6 @@
 package club.joylink.rtss.services.paper;
 
-import club.joylink.rtss.controller.paper.PaperCompositionWithRuleVo;
+import club.joylink.rtss.vo.paper.PaperCompositionWithRuleVo;
 import club.joylink.rtss.dao.SysAccountDAO;
 import club.joylink.rtss.dao.paper.PaperCompositionDAO;
 import club.joylink.rtss.dao.paper.PaperRuleDAO;
@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.*;
diff --git a/src/main/java/club/joylink/rtss/controller/paper/PaperCompositionWithRuleVo.java b/src/main/java/club/joylink/rtss/vo/paper/PaperCompositionWithRuleVo.java
similarity index 98%
rename from src/main/java/club/joylink/rtss/controller/paper/PaperCompositionWithRuleVo.java
rename to src/main/java/club/joylink/rtss/vo/paper/PaperCompositionWithRuleVo.java
index 95e329242..ee419a751 100644
--- a/src/main/java/club/joylink/rtss/controller/paper/PaperCompositionWithRuleVo.java
+++ b/src/main/java/club/joylink/rtss/vo/paper/PaperCompositionWithRuleVo.java
@@ -1,4 +1,4 @@
-package club.joylink.rtss.controller.paper;
+package club.joylink.rtss.vo.paper;
 
 import club.joylink.rtss.vo.paper.PaperCompositionState;
 import club.joylink.rtss.vo.paper.PaperQType;
diff --git a/src/main/java/club/joylink/rtss/vo/paper/PaperUserWholeVo.java b/src/main/java/club/joylink/rtss/vo/paper/PaperUserWholeVo.java
index b20dcc6e8..aea8ecd77 100644
--- a/src/main/java/club/joylink/rtss/vo/paper/PaperUserWholeVo.java
+++ b/src/main/java/club/joylink/rtss/vo/paper/PaperUserWholeVo.java
@@ -1,6 +1,5 @@
 package club.joylink.rtss.vo.paper;
 
-import club.joylink.rtss.controller.paper.PaperCompositionWithRuleVo;
 import lombok.Data;
 
 import java.util.List;
diff --git a/src/main/java/club/joylink/rtss/vo/paper/convertor/PaperCompositionConvertor.java b/src/main/java/club/joylink/rtss/vo/paper/convertor/PaperCompositionConvertor.java
index 7006b480d..9855f8986 100644
--- a/src/main/java/club/joylink/rtss/vo/paper/convertor/PaperCompositionConvertor.java
+++ b/src/main/java/club/joylink/rtss/vo/paper/convertor/PaperCompositionConvertor.java
@@ -1,10 +1,9 @@
 package club.joylink.rtss.vo.paper.convertor;
 
-import club.joylink.rtss.controller.paper.PaperCompositionWithRuleVo;
+import club.joylink.rtss.vo.paper.PaperCompositionWithRuleVo;
 import club.joylink.rtss.entity.paper.PaperComposition;
 import club.joylink.rtss.entity.paper.PaperRule;
 import club.joylink.rtss.vo.paper.PaperCompositionState;
-import club.joylink.rtss.vo.paper.PaperCompositionVo;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/club/joylink/rtss/vo/paper/convertor/PaperRuleConvertor.java b/src/main/java/club/joylink/rtss/vo/paper/convertor/PaperRuleConvertor.java
index ee5d22433..d012c80c4 100644
--- a/src/main/java/club/joylink/rtss/vo/paper/convertor/PaperRuleConvertor.java
+++ b/src/main/java/club/joylink/rtss/vo/paper/convertor/PaperRuleConvertor.java
@@ -1,6 +1,6 @@
 package club.joylink.rtss.vo.paper.convertor;
 
-import club.joylink.rtss.controller.paper.PaperCompositionWithRuleVo;
+import club.joylink.rtss.vo.paper.PaperCompositionWithRuleVo;
 import club.joylink.rtss.entity.paper.PaperRule;
 import club.joylink.rtss.util.JsonUtils;
 import club.joylink.rtss.vo.paper.CreatePaperRuleReqVo;