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

cjl

2023-07-13 bfae0be9c3980b6ec09f86bcb543bb8960927e14

 screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java

@@ -382,8 +382,10 @@
        if (Double.parseDouble(CO)<4){
            count++;
        }
        if (Double.parseDouble(O8)<160){
            count++;
        if (!O8.equals("--")) {
            if (Double.parseDouble(O8) < 160) {
                count++;
            }
        }