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

cjl

2023-11-07 54beb665319b66742cdec3dffb7e298701d61582

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