Merge remote-tracking branch 'origin/master'

xyc

2024-10-23 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ModelLineService.java

@@ -368,7 +368,7 @@
                    if ("product_sb".equals(productType)) {
                        jsonValue = JsonUtils2.getJsonValueByPath(jsonObject, "data/deviceNo".split("/"));
                        if (jsonValue != null && StringUtils.isNotBlank(jsonValue.toString())) {
                            modelNode.setVoteNum(Integer.valueOf(jsonValue.toString()));
                            modelNode.setDeviceNo(Integer.valueOf(jsonValue.toString()));
                        } else {
                            modelNode.setDeviceNo(0);
                        }