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

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

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

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


}