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

lsh

2024-07-12 eeb2f8b5d98e3cca7522bbf357db1e3eeee76d84

 src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java

@@ -26,5 +26,5 @@
    private String alarm = "-";

    //异常代码
    private Integer jarErr = 0;
    private String jarErr = "-";
}