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

zjj

2024-04-20 9781420b252caedfbefdadf4661428702b1a6540

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

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

    private String pakMk="-";

}