Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai

src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -72,8 +72,8 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
                     return CommonResult.fail("相同日期已有待审批申请");
                 }
                 try {
-                    boolean a=TimeExchange.CompareDate(apt.getEndTime(),applicationProcedureDto.getStartTime(),"yyyy-MM-dd HH:mm:ss");
-                    boolean b=TimeExchange.CompareDate(applicationProcedureDto.getEndTime(),apt.getStartTime(),"yyyy-MM-dd HH:mm:ss");
+                    boolean a=TimeExchange.CompareDate(apt.getEndTime(),applicationProcedureDto.getStartTime(),"yyyy-MM-dd");
+                    boolean b=TimeExchange.CompareDate(applicationProcedureDto.getEndTime(),apt.getStartTime(),"yyyy-MM-dd");
                if(!(a||b)){
                    return CommonResult.fail("日期范围内已有待审批申请");
                }