From 09c68917a06ddc14f4a175373d66fa3fa207f4f9 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 10:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
tms/src/main/java/com/ruoyi/tms/domain/TmsConsignor.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsConsignor.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsConsignor.java
index f8b4d45..81e14b4 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsConsignor.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsConsignor.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
@@ -130,6 +131,25 @@
*/
@TableField("street_id")
private String streetId;
+ @TableField(exist = false)
+ private String region;
+
+ public String getRegion() {
+ if (provinceId != null){
+ region = provinceId;
+ }
+ if (cityId != null){
+ region = region +"," + cityId;
+ }
+ if (districtId != null){
+ region = region +"," + districtId;
+ }
+ if (streetId != null){
+ region = region +"," + streetId;
+ }
+ return region;
+ }
+
/**
@@ -146,6 +166,8 @@
@TableField("dispatch_transport_area")
private String dispatchTransportArea;
+ @TableField("electronic_fence_range")
+ private BigDecimal electronicFenceRange;
/**
* 鍦板浘浣嶇疆锛堢粡绾害锛�
--
Gitblit v1.8.0