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

cjl

2023-07-21 1393ec7b94738419acbfd340cf24d3debaa2b73e

 screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java

@@ -35,4 +35,7 @@

    private Double SHAvg;


    private Double QYAvg;

}