Merge remote-tracking branch 'origin/dev' into dev

jinpengyong

2023-11-10 4686da41b376617f6d447b3546c045ce54f032fa

 screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java

@@ -48,4 +48,6 @@


    boolean UAVTest(BigDecimal lat, BigDecimal lon, String batch);

    boolean UAVUpdateTest(String batch);
}