Merge branch 'dev-zza' into dev

2026-04-23 20:45:10 +08:00 · 2025-06-25 15:38:57 +08:00
parent 029913d03b 1e178d6890
commit fd527e0467
20 changed files with 755 additions and 15 deletions
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
@@ -35,6 +35,21 @@ public class OrderBasicInfo {
     */
    private String orderStatus;

+    /**
+     * 订单类型（1-普通订单；2-并充订单）
+     */
+    private String orderType;
+
+    /**
+     * 并充订单序号
+     */
+    private String mergeChargeNumber;
+
+    /**
+     * 主枪枪编号
+     */
+    private String mainConnectorCode;
+
    /**
     * 会员id
     */