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

jpy

2023-05-27 17d054803583cd870dc15dc16551563ff619c658

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

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


}