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

jinpengyong

2022-03-09 5fa4c1db3141099be4ca176cdf2f3ec10f46c141

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

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


}