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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

 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);
}