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

whycq

2024-10-22 85ce1fa2f3d894cce2be0faa24551dfca7896ac9

 src/main/java/com/zy/core/thread/ScaleThread.java

@@ -55,7 +55,7 @@
                        if (slave.getId()>3){
                            scale = scale - 50.8;
                        } else {
                            scale = scale - 67.6;
                            scale = scale - 74.0;
                        }

                        //将称重重量写入设备基础数据中的gross_wt字段