From 1a5f7432c404946f9ec358b5cb6281a823c466c1 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 14 一月 2025 16:55:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmDelivery.java | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmDelivery.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmDelivery.java index f310c4f..a792be4 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmDelivery.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmDelivery.java @@ -1,5 +1,6 @@ package com.ruoyi.order.vo; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,4 +16,22 @@ private Long orderId; @ApiModelProperty("快递json信息{\"com\":\"shunfeng\",\"num\":\"123456\"}") private String code; + + @ApiModelProperty(value = "发货省") + private String deliverProvince; + + @ApiModelProperty(value = "发货省编号") + private String deliverProvinceCode; + + @ApiModelProperty(value = "发货市") + private String deliverCity; + + @ApiModelProperty(value = "发货市编号") + private String deliverCityCode; + + @ApiModelProperty(value = "发货区") + private String deliverDistrict; + + @ApiModelProperty(value = "发货区编号") + private String deliverDistrictCode; } -- Gitblit v1.7.1