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

zjj

2024-04-18 1f25a5804e4561db6697c42ff5187d31971ae9ca

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

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

    private String pakMk="-";

}