Merge branch 'master' of http://gitea.palntour.com/pav/pav-server

src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java

@@ -179,17 +179,16 @@ public class CtrCntrlController {
 			basetime = "1700";
 		}
 		else if (Integer.parseInt(strhour) <= 20 && Integer.parseInt(strminute ) < 10) {
-			basetime = "2000";
+			basetime = "1700";
 		}
 		else if ((Integer.parseInt(strhour) >= 20 && Integer.parseInt(strminute ) > 9) && Integer.parseInt(strhour) < 23) {
 			basetime = "2000";
 		}
 		else if (Integer.parseInt(strhour) <= 23 && Integer.parseInt(strminute ) < 10) {
-			basetime = "2300";
+			basetime = "2000";
 		}
-		else if (Integer.parseInt(strhour) >= 23 && Integer.parseInt(strminute ) > 9) {
+		else
 			basetime = "2300";
-		}
 
 
 		List<Coordinate> coordList = new ArrayList<>();