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

cjl

2023-10-16 0eaefd62a7caa039a4f16e27be279eac5e84da5c

 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 {