Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2025-02-21 ff2fffad2b049c0be0df5085496429ab4861857f

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntake.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

/**
@@ -12,6 +13,7 @@
 */

@Data
@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat"})
public class VoIntake {
    private static final long serialVersionUID = 202408311404001L;