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

cjl

2023-10-20 a3eaa78c6d839b640c728f4c7d8eb27732627b07

 screen-common/src/main/java/com/moral/util/ComprehensiveIndexUtils.java

@@ -214,4 +214,5 @@
        return comprehensiveIndex;
    }


}