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

whycq

2022-12-03 08192aa7aebc8ca582b61fe2803dcd877329eca3

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -52,6 +52,9 @@
    // 入库暂存数
    private Short inQty;

    // 隔壁站点（台车位置）
    private String nearbySta;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();
        basDevp.setDevNo(siteId);