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

zjj

2024-03-13 59ef340bc31a599a12c616a459977518d595aef5

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

@@ -48,4 +48,6 @@
    private String alarm = "-";
    private Integer RgvPos1 = 0;

    private String pakMk="-";

}