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

1

6 天以前 ccdcd79a48aabb15d9ce9525a3535c01e69475c8

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

@@ -14,7 +14,7 @@
    private String siteId;

    // 工作号
    private Short workNo;
    private Integer workNo;

    // 站点状态
    private SiteStatusType siteStatus;