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

zjj

2024-06-19 2028b51aeda2b6b23fda4183875b145d5e83822f

 src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java

@@ -46,5 +46,8 @@

    // 异常码描述
    private String alarm = "-";
    private Integer RgvPos1 = 0;

    private String pakMk="-";

}