Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/bean/dto/OutsourceApplyDto.java

@@ -0,0 +1,13 @@
+package com.zjugis.business.bean.dto;
+
+import com.zjugis.framework.common.pojo.PageParam;
+import lombok.Data;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/3/14 14:50
+ */
+@Data
+public class OutsourceApplyDto extends PageParam {
+}

zjugis-business/src/main/java/com/zjugis/business/bean/dto/SubcontractApplyDto.java

@@ -0,0 +1,13 @@
+package com.zjugis.business.bean.dto;
+
+import com.zjugis.framework.common.pojo.PageParam;
+import lombok.Data;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/3/14 14:51
+ */
+@Data
+public class SubcontractApplyDto extends PageParam {
+}

zjugis-business/src/main/java/com/zjugis/business/controller/OutsourceApplyController.java

@@ -1,5 +1,6 @@
 package com.zjugis.business.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.OutsourceApplyDto;
 import com.zjugis.business.bean.entity.OutsourceApply;
 import com.zjugis.business.service.OutsourceApplyService;
@@ -7,6 +8,7 @@ import com.zjugis.framework.common.pojo.CommonResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * (OUTSOURCE_APPLY)表控制层
@@ -64,7 +66,6 @@ public class OutsourceApplyController {
     /**
      * 删除数据
      *
-     * @param id 主键
      * @return 删除是否成功
      */
     @DeleteMapping("/outsourceApply")

zjugis-business/src/main/java/com/zjugis/business/controller/SubcontractApplyController.java

@@ -1,5 +1,6 @@
 package com.zjugis.business.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.SubcontractApplyDto;
 import com.zjugis.business.bean.entity.SubcontractApply;
 import com.zjugis.business.service.SubcontractApplyService;
@@ -7,6 +8,7 @@ import com.zjugis.framework.common.pojo.CommonResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * (SUBCONTRACT_APPLY)表控制层
@@ -64,7 +66,6 @@ public class SubcontractApplyController {
     /**
      * 删除数据
      *
-     * @param id 主键
      * @return 删除是否成功
      */
     @DeleteMapping("/subcontractApply")

zjugis-business/src/main/java/com/zjugis/business/service/OutsourceApplyService.java

@@ -1,8 +1,11 @@
 package com.zjugis.business.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.OutsourceApplyDto;
 import com.zjugis.business.bean.entity.OutsourceApply;
 
+import java.util.List;
+
 /**
  * (OUTSOURCE_APPLY)表服务接口
  *

zjugis-business/src/main/java/com/zjugis/business/service/SubcontractApplyService.java

@@ -1,8 +1,11 @@
 package com.zjugis.business.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.SubcontractApplyDto;
 import com.zjugis.business.bean.entity.SubcontractApply;
 
+import java.util.List;
+
 /**
  * (SUBCONTRACT_APPLY)表服务接口
  *

zjugis-business/src/main/java/com/zjugis/business/service/impl/OutsourceApplyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zjugis.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.OutsourceApplyDto;
 import com.zjugis.business.bean.entity.OutsourceApply;
 import com.zjugis.business.mapper.OutsourceApplyMapper;
@@ -8,6 +9,7 @@ import com.zjugis.business.service.OutsourceApplyService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * (OUTSOURCE_APPLY)表服务实现类

zjugis-business/src/main/java/com/zjugis/business/service/impl/SubcontractApplyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zjugis.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.SubcontractApplyDto;
 import com.zjugis.business.bean.entity.SubcontractApply;
 import com.zjugis.business.mapper.SubcontractApplyMapper;
@@ -8,6 +9,7 @@ import com.zjugis.business.service.SubcontractApplyService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * (SUBCONTRACT_APPLY)表服务实现类