From f0d2defd354a3d6fbaf77338f0c42fe133f019fd Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 15 三月 2023 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index e42e540..d2c4888 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -52,6 +52,12 @@
     // 鍏ュ簱鏆傚瓨鏁�
     private Short inQty;
 
+    // 闅斿绔欑偣锛堝彴杞︿綅缃級
+    private String nearbySta;
+
+    // 鎵樼洏鏄彲鍚︽暣鍨�
+    private boolean full;
+
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
         basDevp.setDevNo(siteId);

--
Gitblit v1.9.1