From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 7c16356..04fc872 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -23,6 +23,8 @@
 
     //PACK鐘舵��
     private Integer packSts;
+    //姝ラ
+    private Integer stepSts;
 
     // 鍗曟嵁缂栧彿
     private String orderNo;

--
Gitblit v1.9.1