From 0a9628c6c5880d4eed055d50e6e8083a2e5a8637 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期二, 06 八月 2024 15:48:46 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java index c0c3512..015acd2 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java @@ -1,6 +1,5 @@ package com.dy.pipIrrGlobal.voPr; -import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.dy.common.po.BaseEntity; import lombok.Data; @@ -31,6 +30,21 @@ private String intakeNum; /** + * 鍙栨按鍙g粡搴� + */ + private Double lng; + + /** + * 鍙栨按鍙g含搴� + */ + private Double lat; + + /** + * 绱娴侀噺 + */ + private Double totalAmount; + + /** * 鏄惁鍦ㄧ嚎 */ private Boolean isOnLine; @@ -39,4 +53,10 @@ * 鏄惁缁戝畾 */ private Boolean isBinded; + + + /** + * 鎶ヨ淇℃伅Json鏁扮粍 + */ + private String alarm; } -- Gitblit v1.8.0