Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs

zjj

2024-12-23 2335443d6a9f6ca00a3c1f5270341be12be192dd

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

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

    private String pakMk="-";

}