Merge remote-tracking branch 'origin/jx-fyxc-wcs' into jx-fyxc-wcs

zjj

2025-04-12 e32ff68be04c9e2e3ab689c4494aefe5d3036400

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

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

    private String pakMk="-";

}