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

pang.jiabao

2024-11-06 6548c75a24d8d0c23c8167980465831128abf579

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

@@ -46,5 +46,8 @@

    // 异常码描述
    private String alarm = "-";
    private Integer RgvPos1 = 0;

    private String pakMk="-";

}