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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

 screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java

@@ -293,7 +293,7 @@
                    map.put("cel",1);
                }
            }else {
                if (code.equals("a99054")){
                if (code.equals("a99054")&& !value.contains("+")){
                    String[] split = value.split("\\*");
                    map.put("cel",Double.parseDouble(split[1]));
                }else {