Accept Merge Request #29: (develop-wxl -> master)

Merge Request: 提交

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/29?initial=true

src/main/java/com/template/mapper/ApplicationProcedureTemporaryMapper.java

@@ -38,7 +38,6 @@ public interface ApplicationProcedureTemporaryMapper extends BaseMapper<Applicat
     IPage<ApplicationProcedureTemporaryVo> pageAppletList(Page<ApplicationProcedureTemporaryVo> pageVo,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("status") String status,@Param("orgList")List<String> orgList);
 
     IPage<ApplicationProcedureTemporaryVo> parentAppletPageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("status") String status,@Param("orgList")List<String> orgList);
-    IPage<ApplicationProcedureTemporaryVo> parentAppletPageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("status") String status);
 
     List<ApplicationProcedureTemporary> getApt(@Param("state") LocalDate state,@Param("end") LocalDate end,@Param("userId") String userId);
 }

src/main/java/com/template/services/ApplicationProcedureTemporaryService.java

@@ -34,7 +34,6 @@ public interface ApplicationProcedureTemporaryService extends IService<Applicati
     PageUtils<ApplicationProcedureTemporaryVo> pageAppletList(String startTime, String endTime, String status, int page, int size,List<String> orgList);
 
     PageUtils<ApplicationProcedureTemporaryVo> parentAppletPageList(String startTime, String endTime, String status, int page, int size,List<String> orgList);
-    PageUtils<ApplicationProcedureTemporaryVo> parentAppletPageList(String startTime, String endTime, String status, int page, int size);
 
     List<ApplicationProcedureTemporary> getApt(LocalDate state, LocalDate end, String userId);
 }