Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-02 1d43e01376590a26a8e976a398b4744b6906cab4

 ycl-server/src/main/java/com/ycl/api/DH/module/LoginModule.java

@@ -186,7 +186,7 @@
                    NET_TITLE_OSD_INFO[] stuOSD = title.stuOSD;
                    for (NET_TITLE_OSD_INFO osd : stuOSD) {
                        String osdStr = null;
                        osdStr = new String(osd.szText, StandardCharsets.UTF_8);
                        osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
                        if (!StringUtils.isEmpty(osdStr)) {
                            osdResult.setOSD4(osdStr);
                        }
@@ -196,7 +196,7 @@
                    int num = 0;
                    for (NET_TITLE_OSD_INFO osd : stuOSD) {
                        String osdStr = null;
                        osdStr = new String(osd.szText, StandardCharsets.UTF_8);
                        osdStr = new String(osd.szText, StandardCharsets.UTF_8).trim();
                        if (!StringUtils.isEmpty(osdStr)) {
                            if(num ==0){
                                osdResult.setOSD1(osdStr);