1

science-admin/src/main/java/com/yiboshi/science/dao/ComBatchDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComBatch;
 import com.yiboshi.science.param.dto.ComBatchDTO;
-import com.yiboshi.science.enumeration.query.ComBatchQueryVO;
+import com.yiboshi.science.param.query.ComBatchQueryVO;
 
 /**
  * 人员表 DAO

science-admin/src/main/java/com/yiboshi/science/dao/ComConclusionCatalogDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComConclusionCatalog;
 import com.yiboshi.science.param.dto.ComConclusionCatalogDTO;
-import com.yiboshi.science.enumeration.query.ComConclusionCatalogQueryVO;
+import com.yiboshi.science.param.query.ComConclusionCatalogQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComConclusionFundsDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComConclusionFunds;
 import com.yiboshi.science.param.dto.ComConclusionFundsDTO;
-import com.yiboshi.science.enumeration.query.ComConclusionFundsQueryVO;
+import com.yiboshi.science.param.query.ComConclusionFundsQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComConclusionResearchersDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComConclusionResearchers;
 import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
-import com.yiboshi.science.enumeration.query.ComConclusionResearchersQueryVO;
+import com.yiboshi.science.param.query.ComConclusionResearchersQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComConclusionThesisDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComConclusionThesis;
 import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
-import com.yiboshi.science.enumeration.query.ComConclusionThesisQueryVO;
+import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComDownloadDAO.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComDownload;
 import com.yiboshi.science.param.dto.ComDownloadDTO;
-import com.yiboshi.science.enumeration.query.ComDownloadQueryVO;
+import com.yiboshi.science.param.query.ComDownloadQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 /**

science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationContentDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComEvaluationContent;
 import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationContentQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationContentQueryVO;
 
 
 public interface ComEvaluationContentDAO extends BaseMapper<ComEvaluationContent>, BaseDAO<ComEvaluationContentQueryVO, ComEvaluationContentDTO,ComEvaluationContent> {

science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComEvaluation;
 import com.yiboshi.science.param.dto.ComEvaluationDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationQueryVO;
 
 
 public interface ComEvaluationDAO extends BaseMapper<ComEvaluation>, BaseDAO<ComEvaluationQueryVO, ComEvaluationDTO,ComEvaluation> {

science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationItemDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComEvaluationItem;
 import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationItemQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationItemQueryVO;
 
 
 public interface ComEvaluationItemDAO extends BaseMapper<ComEvaluationItem>, BaseDAO<ComEvaluationItemQueryVO, ComEvaluationItemDTO,ComEvaluationItem> {

science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationItemNoteDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComEvaluationItemNote;
 import com.yiboshi.science.param.dto.ComEvaluationItemNoteDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationItemNoteQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationItemNoteQueryVO;
 
 
 public interface ComEvaluationItemNoteDAO extends BaseMapper<ComEvaluationItemNote>, BaseDAO<ComEvaluationItemNoteQueryVO, ComEvaluationItemNoteDTO,ComEvaluationItemNote> {

science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationNoteDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComEvaluationNote;
 import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationNoteQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
 
 
 public interface ComEvaluationNoteDAO extends BaseMapper<ComEvaluationNote>, BaseDAO<ComEvaluationNoteQueryVO, ComEvaluationNoteDTO,ComEvaluationNote> {

science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationStandardDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComEvaluationStandard;
 import com.yiboshi.science.param.dto.ComEvaluationStandardDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationStandardQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationStandardQueryVO;
 
 public interface ComEvaluationStandardDAO extends BaseMapper<ComEvaluationStandard>, BaseDAO<ComEvaluationStandardQueryVO, ComEvaluationStandardDTO, ComEvaluationStandard> {
 

science-admin/src/main/java/com/yiboshi/science/dao/ComEvaluationValueDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComEvaluationValue;
 import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationValueQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
 
 
 public interface ComEvaluationValueDAO extends BaseMapper<ComEvaluationValue>, BaseDAO<ComEvaluationValueQueryVO, ComEvaluationValueDTO,ComEvaluationValue> {

science-admin/src/main/java/com/yiboshi/science/dao/ComExpertBatchDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComExpertBatch;
 import com.yiboshi.science.param.dto.ComExpertBatchDTO;
-import com.yiboshi.science.enumeration.query.ComExpertBatchQueryVO;
+import com.yiboshi.science.param.query.ComExpertBatchQueryVO;
 
 
 public interface ComExpertBatchDAO extends BaseMapper<ComExpertBatch>, BaseDAO<ComExpertBatchQueryVO, ComExpertBatchDTO,ComExpertBatch> {

science-admin/src/main/java/com/yiboshi/science/dao/ComExpertDAO.java

@@ -7,7 +7,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComExpert;
 import com.yiboshi.science.entity.SystemMenu;
 import com.yiboshi.science.param.dto.ComExpertDTO;
-import com.yiboshi.science.enumeration.query.ComExpertQueryVO;
+import com.yiboshi.science.param.query.ComExpertQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/ComExpertGroupAssignDAO.java

@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.AssignCount;
 import com.yiboshi.science.entity.ComExpertGroupAssign;
 import com.yiboshi.science.param.dto.ComExpertGroupAssignDTO;
-import com.yiboshi.science.enumeration.query.ComExpertGroupAssignQueryVO;
+import com.yiboshi.science.param.query.ComExpertGroupAssignQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComExpertGroupDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComExpertGroup;
 import com.yiboshi.science.param.dto.ComExpertGroupDTO;
-import com.yiboshi.science.enumeration.query.ComExpertGroupQueryVO;
+import com.yiboshi.science.param.query.ComExpertGroupQueryVO;
 
 
 public interface ComExpertGroupDAO extends BaseMapper<ComExpertGroup>, BaseDAO<ComExpertGroupQueryVO, ComExpertGroupDTO,ComExpertGroup> {

science-admin/src/main/java/com/yiboshi/science/dao/ComExpertGroupMembersDAO.java

@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComExpertGroupMembers;
 import com.yiboshi.science.entity.SelectListItem;
 import com.yiboshi.science.param.dto.ComExpertGroupMembersDTO;
-import com.yiboshi.science.enumeration.query.ComExpertGroupMembersQueryVO;
+import com.yiboshi.science.param.query.ComExpertGroupMembersQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComExpertSpecDAO.java

@@ -7,7 +7,7 @@ import com.yiboshi.science.entity.ComExpertSpec;
 import com.yiboshi.science.entity.SystemMenu;
 import com.yiboshi.science.param.dto.ComExpertDTO;
 import com.yiboshi.science.param.dto.ComExpertSpecDTO;
-import com.yiboshi.science.enumeration.query.ComExpertSpecQueryVO;
+import com.yiboshi.science.param.query.ComExpertSpecQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/ComFileDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComFile;
 import com.yiboshi.science.param.dto.ComFileDTO;
-import com.yiboshi.science.enumeration.query.ComFileQueryVO;
+import com.yiboshi.science.param.query.ComFileQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComManagerDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComManager;
 import com.yiboshi.science.param.dto.ComManagerDTO;
-import com.yiboshi.science.enumeration.query.ComManagerQueryVO;
+import com.yiboshi.science.param.query.ComManagerQueryVO;
 
 /**
  * 单位管理员表 DAO

science-admin/src/main/java/com/yiboshi/science/dao/ComNoticeDAO.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComNotice;
 import com.yiboshi.science.param.dto.ComNoticeDTO;
-import com.yiboshi.science.enumeration.query.ComNoticeQueryVO;
+import com.yiboshi.science.param.query.ComNoticeQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 /**

science-admin/src/main/java/com/yiboshi/science/dao/ComPersonDAO.java

@@ -7,7 +7,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComPerson;
 import com.yiboshi.science.param.dto.ComPersonDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.enumeration.query.ComPersonQueryVO;
+import com.yiboshi.science.param.query.ComPersonQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/ComPersonResumeDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComPersonResume;
 import com.yiboshi.science.param.dto.ComPersonResumeDTO;
-import com.yiboshi.science.enumeration.query.ComPersonResumeQueryVO;
+import com.yiboshi.science.param.query.ComPersonResumeQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComPersonScientificGainDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComPersonScientificGain;
 import com.yiboshi.science.param.dto.ComPersonScientificGainDTO;
-import com.yiboshi.science.enumeration.query.ComPersonScientificGainQueryVO;
+import com.yiboshi.science.param.query.ComPersonScientificGainQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectAssignDAO.java

@@ -6,7 +6,7 @@ import com.yiboshi.science.entity.AssignCount;
 import com.yiboshi.science.entity.ComProjectAssign;
 import com.yiboshi.science.param.dto.ComProjectAssignDTO;
 import com.yiboshi.science.param.dto.ComProjectGroupDTO;
-import com.yiboshi.science.enumeration.query.ComProjectAssignQueryVO;
+import com.yiboshi.science.param.query.ComProjectAssignQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectAuditDAO.java

@@ -7,7 +7,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProject;
 import com.yiboshi.science.entity.ComProjectAudit;
 import com.yiboshi.science.param.dto.*;
-import com.yiboshi.science.enumeration.query.ComProjectAuditQueryVO;
+import com.yiboshi.science.param.query.ComProjectAuditQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectAuditNoteDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectAuditNote;
 import com.yiboshi.science.param.dto.ComProjectAuditNoteDTO;
-import com.yiboshi.science.enumeration.query.ComProjectAuditNoteQueryVO;
+import com.yiboshi.science.param.query.ComProjectAuditNoteQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectBasicDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectBasic;
 import com.yiboshi.science.param.dto.ComProjectBasicDTO;
-import com.yiboshi.science.enumeration.query.ComProjectBasicQueryVO;
+import com.yiboshi.science.param.query.ComProjectBasicQueryVO;
 
 
 public interface ComProjectBasicDAO extends BaseMapper<ComProjectBasic>, BaseDAO<ComProjectBasicQueryVO, ComProjectBasicDTO,ComProjectBasic> {

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectBudgetDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectBudget;
 import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
-import com.yiboshi.science.enumeration.query.ComProjectBudgetQueryVO;
+import com.yiboshi.science.param.query.ComProjectBudgetQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectCheckDAO.java

@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectCheck;
 import com.yiboshi.science.param.dto.ComProjectCheckDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.enumeration.query.ComProjectCheckQueryVO;
+import com.yiboshi.science.param.query.ComProjectCheckQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 /**

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectConclusionDAO.java

@@ -6,7 +6,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectConclusion;
 import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.enumeration.query.ComProjectConclusionQueryVO;
+import com.yiboshi.science.param.query.ComProjectConclusionQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 /**

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectConclusionMaterialDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectConclusionMaterial;
 import com.yiboshi.science.param.dto.ComProjectConclusionMaterialDTO;
-import com.yiboshi.science.enumeration.query.ComProjectConclusionMaterialQueryVO;
+import com.yiboshi.science.param.query.ComProjectConclusionMaterialQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectCooperativeUnitsDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectCooperativeUnits;
 import com.yiboshi.science.param.dto.ComProjectCooperativeUnitsDTO;
-import com.yiboshi.science.enumeration.query.ComProjectCooperativeUnitsQueryVO;
+import com.yiboshi.science.param.query.ComProjectCooperativeUnitsQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectDAO.java

@@ -6,7 +6,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProject;
 import com.yiboshi.science.param.dto.ComProjectDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.enumeration.query.ComProjectQueryVO;
+import com.yiboshi.science.param.query.ComProjectQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 /**

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectEquipmentDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectEquipment;
 import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
-import com.yiboshi.science.enumeration.query.ComProjectEquipmentQueryVO;
+import com.yiboshi.science.param.query.ComProjectEquipmentQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectFundCompositionDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectFundComposition;
 import com.yiboshi.science.param.dto.ComProjectFundCompositionDTO;
-import com.yiboshi.science.enumeration.query.ComProjectFundCompositionQueryVO;
+import com.yiboshi.science.param.query.ComProjectFundCompositionQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectFundPlanDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectFundPlan;
 import com.yiboshi.science.param.dto.ComProjectFundPlanDTO;
-import com.yiboshi.science.enumeration.query.ComProjectFundPlanQueryVO;
+import com.yiboshi.science.param.query.ComProjectFundPlanQueryVO;
 
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectGroupAssignDAO.java

@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectGroupAssign;
 import com.yiboshi.science.param.dto.ComProjectAssignDTO;
 import com.yiboshi.science.param.dto.ComProjectGroupAssignDTO;
-import com.yiboshi.science.enumeration.query.ComProjectGroupAssignQueryVO;
+import com.yiboshi.science.param.query.ComProjectGroupAssignQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectGroupDAO.java

@@ -6,7 +6,7 @@ import com.yiboshi.science.entity.ComProjectGroup;
 import com.yiboshi.science.param.dto.ComProjectAssignDTO;
 import com.yiboshi.science.param.dto.ComProjectGroupDTO;
 import com.yiboshi.science.param.dto.ComProjectKnowledgeStatisticDTO;
-import com.yiboshi.science.enumeration.query.ComProjectGroupQueryVO;
+import com.yiboshi.science.param.query.ComProjectGroupQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectGroupDetailDAO.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectGroupDetail;
 import com.yiboshi.science.param.dto.ComProjectGroupDetailDTO;
-import com.yiboshi.science.enumeration.query.ComProjectGroupDetailQueryVO;
+import com.yiboshi.science.param.query.ComProjectGroupDetailQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectKpitDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectKpit;
 import com.yiboshi.science.param.dto.ComProjectKpitDTO;
-import com.yiboshi.science.enumeration.query.ComProjectKpitQueryVO;
+import com.yiboshi.science.param.query.ComProjectKpitQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectKpitDetailDAO.java

@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectKpitDetail;
 import com.yiboshi.science.param.dto.ComProjectKpitDTO;
 import com.yiboshi.science.param.dto.ComProjectKpitDetailDTO;
-import com.yiboshi.science.enumeration.query.ComProjectKpitDetailQueryVO;
+import com.yiboshi.science.param.query.ComProjectKpitDetailQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectManagementRuleDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectManagementRule;
 import com.yiboshi.science.param.dto.ComProjectManagementRuleDTO;
-import com.yiboshi.science.enumeration.query.ComProjectManagementRuleQueryVO;
+import com.yiboshi.science.param.query.ComProjectManagementRuleQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectManufactureDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectManufacture;
 import com.yiboshi.science.param.dto.ComProjectManufactureDTO;
-import com.yiboshi.science.enumeration.query.ComProjectManufactureQueryVO;
+import com.yiboshi.science.param.query.ComProjectManufactureQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectMembersDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectMembers;
 import com.yiboshi.science.param.dto.ComProjectMembersDTO;
-import com.yiboshi.science.enumeration.query.ComProjectMembersQueryVO;
+import com.yiboshi.science.param.query.ComProjectMembersQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectResearchDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectResearch;
 import com.yiboshi.science.param.dto.ComProjectResearchDTO;
-import com.yiboshi.science.enumeration.query.ComProjectResearchQueryVO;
+import com.yiboshi.science.param.query.ComProjectResearchQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectResultsDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectResults;
 import com.yiboshi.science.param.dto.ComProjectResultsDTO;
-import com.yiboshi.science.enumeration.query.ComProjectResultsQueryVO;
+import com.yiboshi.science.param.query.ComProjectResultsQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectStageGoalDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectStageGoal;
 import com.yiboshi.science.param.dto.ComProjectStageGoalDTO;
-import com.yiboshi.science.enumeration.query.ComProjectStageGoalQueryVO;
+import com.yiboshi.science.param.query.ComProjectStageGoalQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectSubDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectSub;
 import com.yiboshi.science.param.dto.ComProjectSubDTO;
-import com.yiboshi.science.enumeration.query.ComProjectSubQueryVO;
+import com.yiboshi.science.param.query.ComProjectSubQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectTaskDAO.java

@@ -6,7 +6,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectTask;
 import com.yiboshi.science.param.dto.ComProjectTaskDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.enumeration.query.ComProjectTaskQueryVO;
+import com.yiboshi.science.param.query.ComProjectTaskQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 /**

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectUnitPaymentDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectUnitPayment;
 import com.yiboshi.science.param.dto.ComProjectUnitPaymentDTO;
-import com.yiboshi.science.enumeration.query.ComProjectUnitPaymentQueryVO;
+import com.yiboshi.science.param.query.ComProjectUnitPaymentQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComSendingRecordDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComSendingRecord;
 import com.yiboshi.science.param.dto.ComSendingRecordDTO;
-import com.yiboshi.science.enumeration.query.ComSendingRecordQueryVO;
+import com.yiboshi.science.param.query.ComSendingRecordQueryVO;
 
 /**
  * 信息发送记录表 DAO

science-admin/src/main/java/com/yiboshi/science/dao/ComTalentApplyDAO.java

@@ -6,7 +6,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComTalentApply;
 import com.yiboshi.science.param.dto.ComTalentApplyDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.enumeration.query.ComTalentApplyQueryVO;
+import com.yiboshi.science.param.query.ComTalentApplyQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 /**

science-admin/src/main/java/com/yiboshi/science/dao/ComTalentBudgetDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComTalentBudget;
 import com.yiboshi.science.param.dto.ComTalentBudgetDTO;
-import com.yiboshi.science.enumeration.query.ComTalentBudgetQueryVO;
+import com.yiboshi.science.param.query.ComTalentBudgetQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComTalentMembersDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComTalentMembers;
 import com.yiboshi.science.param.dto.ComTalentMembersDTO;
-import com.yiboshi.science.enumeration.query.ComTalentMembersQueryVO;
+import com.yiboshi.science.param.query.ComTalentMembersQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComTaskTargetDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComTaskTarget;
 import com.yiboshi.science.param.dto.ComTaskTargetDTO;
-import com.yiboshi.science.enumeration.query.ComTaskTargetQueryVO;
+import com.yiboshi.science.param.query.ComTaskTargetQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/ComUnitDAO.java

@@ -7,7 +7,7 @@ import com.yiboshi.science.entity.ComProject;
 import com.yiboshi.science.entity.ComUnit;
 import com.yiboshi.science.param.dto.ComUnitDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.enumeration.query.ComUnitQueryVO;
+import com.yiboshi.science.param.query.ComUnitQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/LogsExceptionDAO.java

@@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.LogsException;
 import com.yiboshi.science.param.dto.LogsExceptionDTO;
-import com.yiboshi.science.enumeration.query.LogsExceptionQueryVO;
+import com.yiboshi.science.param.query.LogsExceptionQueryVO;
 
 /**
  * 异常日志 DAO

science-admin/src/main/java/com/yiboshi/science/dao/LogsLoginDAO.java

@@ -4,7 +4,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.LogsLogin;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
 import com.yiboshi.science.param.dto.LogsLoginDTO;
-import com.yiboshi.science.enumeration.query.LogsLoginQueryVO;
+import com.yiboshi.science.param.query.LogsLoginQueryVO;
 
 /**
  * 登录日志表 DAO

science-admin/src/main/java/com/yiboshi/science/dao/LogsOperationDAO.java

@@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.LogsOperation;
 import com.yiboshi.science.param.dto.LogsOperationDTO;
-import com.yiboshi.science.enumeration.query.LogsOperationQueryVO;
+import com.yiboshi.science.param.query.LogsOperationQueryVO;
 
 /**
  * 操作日志表 DAO

science-admin/src/main/java/com/yiboshi/science/dao/LogsRequestExceptionDAO.java

@@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.LogsRequestException;
 import com.yiboshi.science.param.dto.LogsRequestExceptionDTO;
-import com.yiboshi.science.enumeration.query.LogsRequestExceptionQueryVO;
+import com.yiboshi.science.param.query.LogsRequestExceptionQueryVO;
 
 /**
  * 请求异常日志表 DAO

science-admin/src/main/java/com/yiboshi/science/dao/SystemMenuDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.SystemMenu;
 import com.yiboshi.science.param.dto.SystemMenuDTO;
-import com.yiboshi.science.enumeration.query.SystemMenuQueryVO;
+import com.yiboshi.science.param.query.SystemMenuQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/SystemMenuRoleDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.SystemMenuRole;
 import com.yiboshi.science.param.dto.SystemMenuRoleDTO;
-import com.yiboshi.science.enumeration.query.SystemMenuRoleQueryVO;
+import com.yiboshi.science.param.query.SystemMenuRoleQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/dao/SystemParameterDAO.java

@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.SystemParameter;
 import com.yiboshi.science.param.dto.SpecDTO;
 import com.yiboshi.science.param.dto.SystemParameterDTO;
-import com.yiboshi.science.enumeration.query.SystemParameterQueryVO;
+import com.yiboshi.science.param.query.SystemParameterQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/SystemParameterTypeDAO.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.SystemParameterType;
 import com.yiboshi.science.param.dto.SystemParameterTypeDTO;
-import com.yiboshi.science.enumeration.query.SystemParameterTypeQueryVO;
+import com.yiboshi.science.param.query.SystemParameterTypeQueryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

science-admin/src/main/java/com/yiboshi/science/dao/SystemRoleDAO.java

@@ -3,7 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.SystemRole;
 import com.yiboshi.science.param.dto.SystemRoleDTO;
-import com.yiboshi.science.enumeration.query.SystemRoleQueryVO;
+import com.yiboshi.science.param.query.SystemRoleQueryVO;
 
 /**
  * 系统角色表 DAO

science-admin/src/main/java/com/yiboshi/science/dao/SystemSetDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.SystemSet;
 import com.yiboshi.science.param.dto.SystemSetDTO;
-import com.yiboshi.science.enumeration.query.SystemSetQueryVO;
+import com.yiboshi.science.param.query.SystemSetQueryVO;
 
 /**
  * 配置表 DAO

science-admin/src/main/java/com/yiboshi/science/dao/SystemUserDAO.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.SystemUser;
 import com.yiboshi.science.param.dto.SystemUserDTO;
-import com.yiboshi.science.enumeration.query.SystemUserQueryVO;
+import com.yiboshi.science.param.query.SystemUserQueryVO;
 
 /**
  * 用户信息表 DAO

science-admin/src/main/java/com/yiboshi/science/dao/SystemUserRoleDAO.java

@@ -5,7 +5,7 @@ import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.SystemUserRole;
 import com.yiboshi.science.param.dto.SystemUserDTO;
 import com.yiboshi.science.param.dto.SystemUserRoleDTO;
-import com.yiboshi.science.enumeration.query.SystemUserRoleQueryVO;
+import com.yiboshi.science.param.query.SystemUserRoleQueryVO;
 
 import java.util.List;
 

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComBatchController.java

@@ -7,7 +7,7 @@ import com.yiboshi.science.entity.ComBatch;
 import com.yiboshi.science.entity.SelectListItem;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComBatchDTO;
-import com.yiboshi.science.enumeration.query.ComBatchQueryVO;
+import com.yiboshi.science.param.query.ComBatchQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComBatchService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComConclusionCatalogController.java

@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComConclusionCatalog;
 import com.yiboshi.science.param.dto.ComConclusionCatalogDTO;
-import com.yiboshi.science.enumeration.query.ComConclusionCatalogQueryVO;
+import com.yiboshi.science.param.query.ComConclusionCatalogQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComConclusionCatalogService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComConclusionFundsController.java

@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComConclusionFunds;
 import com.yiboshi.science.param.dto.ComConclusionFundsDTO;
-import com.yiboshi.science.enumeration.query.ComConclusionFundsQueryVO;
+import com.yiboshi.science.param.query.ComConclusionFundsQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComConclusionFundsService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComConclusionResearchersController.java

@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComConclusionResearchers;
 import com.yiboshi.science.param.dto.ComConclusionResearchersDTO;
-import com.yiboshi.science.enumeration.query.ComConclusionResearchersQueryVO;
+import com.yiboshi.science.param.query.ComConclusionResearchersQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComConclusionResearchersService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComConclusionThesisController.java

@@ -4,7 +4,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.entity.ComConclusionThesis;
 import com.yiboshi.science.param.dto.ComConclusionThesisDTO;
-import com.yiboshi.science.enumeration.query.ComConclusionThesisQueryVO;
+import com.yiboshi.science.param.query.ComConclusionThesisQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComConclusionThesisService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComDownloadController.java

@@ -6,7 +6,7 @@ import com.yiboshi.science.config.annotation.Logs;
 import com.yiboshi.science.entity.ComDownload;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComDownloadDTO;
-import com.yiboshi.science.enumeration.query.ComDownloadQueryVO;
+import com.yiboshi.science.param.query.ComDownloadQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComDownloadService;
 import com.yiboshi.science.service.SystemSetService;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationContentController.java

@@ -4,7 +4,7 @@ package com.yiboshi.science.rest.v1;
 import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.entity.ComEvaluationContent;
 import com.yiboshi.science.param.dto.ComEvaluationContentDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationContentQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationContentQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComEvaluationContentService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationController.java

@@ -5,7 +5,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.entity.ComEvaluation;
 import com.yiboshi.science.param.dto.ComEvaluationDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComEvaluationService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationItemController.java

@@ -4,7 +4,7 @@ package com.yiboshi.science.rest.v1;
 import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.entity.ComEvaluationItem;
 import com.yiboshi.science.param.dto.ComEvaluationItemDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationItemQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationItemQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComEvaluationItemService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationItemNoteController.java

@@ -3,7 +3,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComEvaluationItemNote;
 import com.yiboshi.science.param.dto.ComEvaluationItemNoteDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationItemNoteQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationItemNoteQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComEvaluationItemNoteService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationNoteController.java

@@ -3,7 +3,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComEvaluationNote;
 import com.yiboshi.science.param.dto.ComEvaluationNoteDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationNoteQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationNoteQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComEvaluationNoteService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationStandardController.java

@@ -5,7 +5,7 @@ import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.entity.ComEvaluationStandard;
 import com.yiboshi.science.param.dto.ComBatchDTO;
 import com.yiboshi.science.param.dto.ComEvaluationStandardDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationStandardQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationStandardQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComEvaluationStandardService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComEvaluationValueController.java

@@ -4,7 +4,7 @@ package com.yiboshi.science.rest.v1;
 import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.entity.ComEvaluationValue;
 import com.yiboshi.science.param.dto.ComEvaluationValueDTO;
-import com.yiboshi.science.enumeration.query.ComEvaluationValueQueryVO;
+import com.yiboshi.science.param.query.ComEvaluationValueQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComEvaluationValueService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertBatchController.java

@@ -5,7 +5,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.entity.ComExpertBatch;
 import com.yiboshi.science.param.dto.ComExpertBatchDTO;
-import com.yiboshi.science.enumeration.query.ComExpertBatchQueryVO;
+import com.yiboshi.science.param.query.ComExpertBatchQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComExpertBatchService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertController.java

@@ -11,7 +11,7 @@ import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComExpertDTO;
 import com.yiboshi.science.param.dto.ComExpertSpecDTO;
 import com.yiboshi.science.param.dto.ComUnitDTO;
-import com.yiboshi.science.enumeration.query.ComExpertQueryVO;
+import com.yiboshi.science.param.query.ComExpertQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.*;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertGroupAssignController.java

@@ -4,7 +4,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.entity.ComExpertGroupAssign;
 import com.yiboshi.science.param.dto.ComExpertGroupAssignDTO;
-import com.yiboshi.science.enumeration.query.ComExpertGroupAssignQueryVO;
+import com.yiboshi.science.param.query.ComExpertGroupAssignQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComExpertGroupAssignService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertGroupController.java

@@ -5,7 +5,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.entity.ComExpertGroup;
 import com.yiboshi.science.param.dto.ComExpertGroupDTO;
-import com.yiboshi.science.enumeration.query.ComExpertGroupQueryVO;
+import com.yiboshi.science.param.query.ComExpertGroupQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComExpertGroupAssignService;
 import com.yiboshi.science.service.ComExpertGroupService;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertGroupMembersController.java

@@ -3,7 +3,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComExpertGroupMembers;
 import com.yiboshi.science.param.dto.ComExpertGroupMembersDTO;
-import com.yiboshi.science.enumeration.query.ComExpertGroupMembersQueryVO;
+import com.yiboshi.science.param.query.ComExpertGroupMembersQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComExpertGroupMembersService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComExpertSpecController.java

@@ -5,7 +5,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.entity.ComExpertSpec;
 import com.yiboshi.science.entity.SelectListItem;
 import com.yiboshi.science.param.dto.ComExpertSpecDTO;
-import com.yiboshi.science.enumeration.query.ComExpertSpecQueryVO;
+import com.yiboshi.science.param.query.ComExpertSpecQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComExpertSpecService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComFileController.java

@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComFile;
 import com.yiboshi.science.param.dto.ComFileDTO;
-import com.yiboshi.science.enumeration.query.ComFileQueryVO;
+import com.yiboshi.science.param.query.ComFileQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComFileService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComManagerController.java

@@ -7,7 +7,7 @@ import com.yiboshi.science.entity.ComPerson;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComManagerDTO;
 import com.yiboshi.science.param.dto.ComPersonDTO;
-import com.yiboshi.science.enumeration.query.ComManagerQueryVO;
+import com.yiboshi.science.param.query.ComManagerQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComManagerService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComNoticeController.java

@@ -4,7 +4,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.entity.ComNotice;
 import com.yiboshi.science.param.dto.ComNoticeDTO;
-import com.yiboshi.science.enumeration.query.ComNoticeQueryVO;
+import com.yiboshi.science.param.query.ComNoticeQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComNoticeService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComPersonController.java

@@ -9,7 +9,7 @@ import com.yiboshi.science.entity.ComPerson;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComPersonDTO;
 import com.yiboshi.science.param.dto.ComUnitDTO;
-import com.yiboshi.science.enumeration.query.ComPersonQueryVO;
+import com.yiboshi.science.param.query.ComPersonQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComPersonService;
 import com.yiboshi.science.service.ComUnitService;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectAssignController.java

@@ -7,7 +7,7 @@ import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.entity.ComProjectAssign;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComProjectAssignDTO;
-import com.yiboshi.science.enumeration.query.ComProjectAssignQueryVO;
+import com.yiboshi.science.param.query.ComProjectAssignQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComExpertSpecService;
 import com.yiboshi.science.service.ComProjectAssignService;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectAuditController.java

@@ -10,7 +10,7 @@ import com.yiboshi.science.entity.ComProjectAudit;
 import com.yiboshi.science.entity.ComUnit;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.*;
-import com.yiboshi.science.enumeration.query.ComProjectAuditQueryVO;
+import com.yiboshi.science.param.query.ComProjectAuditQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComProjectAssignService;
 import com.yiboshi.science.service.ComProjectAuditService;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectAuditNoteController.java

@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComProjectAuditNote;
 import com.yiboshi.science.param.dto.ComProjectAuditNoteDTO;
-import com.yiboshi.science.enumeration.query.ComProjectAuditNoteQueryVO;
+import com.yiboshi.science.param.query.ComProjectAuditNoteQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComProjectAuditNoteService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectBasicController.java

@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComProjectBasic;
 import com.yiboshi.science.param.dto.ComProjectBasicDTO;
-import com.yiboshi.science.enumeration.query.ComProjectBasicQueryVO;
+import com.yiboshi.science.param.query.ComProjectBasicQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComProjectBasicService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectBudgetController.java

@@ -2,7 +2,7 @@ package com.yiboshi.science.rest.v1;
 
 import com.yiboshi.science.entity.ComProjectBudget;
 import com.yiboshi.science.param.dto.ComProjectBudgetDTO;
-import com.yiboshi.science.enumeration.query.ComProjectBudgetQueryVO;
+import com.yiboshi.science.param.query.ComProjectBudgetQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComProjectBudgetService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectCheckController.java

@@ -10,7 +10,7 @@ import com.yiboshi.science.entity.SelectListItem;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComProjectCheckDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.enumeration.query.ComProjectCheckQueryVO;
+import com.yiboshi.science.param.query.ComProjectCheckQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComProjectCheckService;
 import io.swagger.annotations.Api;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectConclusionController.java

@@ -11,7 +11,7 @@ import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.ComProjectConclusionDTO;
 import com.yiboshi.science.param.dto.ComUnitDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.enumeration.query.ComProjectConclusionQueryVO;
+import com.yiboshi.science.param.query.ComProjectConclusionQueryVO;
 import com.yiboshi.science.rest.BaseController;
 import com.yiboshi.science.service.ComProjectConclusionService;
 import com.yiboshi.science.service.ComUnitService;