From c97ae0369607c7091041273012b291d3b6e6bdc1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 25 八月 2025 10:10:01 +0800
Subject: [PATCH] 迭代代码

---
 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
index 7511431..bbd5cab 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
@@ -28,8 +28,8 @@
     /**
      * 主键id
      */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "id", type = IdType.NONE)
+    private Long id;
     /**
      * 订单编号
      */
@@ -103,14 +103,19 @@
     @ApiModelProperty(value = "收货人地址")
     private String consigneeAddress;
 
+    @ApiModelProperty(value = "收货地址 所属省")
+    @TableField("province")
+    private String province;
+    @ApiModelProperty(value = "收货地址  所属市")
+    @TableField("city")
+    private String city;
 
-    public Integer getId() {
-        return id;
-    }
+    @ApiModelProperty(value = "订单备注")
+    @TableField("remark")
+    private String remark;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+
+
 
     public String getOrderNumber() {
         return orderNumber;
@@ -195,17 +200,17 @@
     @Override
     public String toString() {
         return "TOrder{" +
-        ", id=" + id +
-        ", orderNumber=" + orderNumber +
-        ", userId=" + userId +
-        ", insertTime=" + insertTime +
-        ", goodsId=" + goodsId +
-        ", count=" + count +
-        ", state=" + state +
-        ", express=" + express +
-        ", expressNumber=" + expressNumber +
-        ", expressTime=" + expressTime +
-        ", integral=" + integral +
-        "}";
+                ", id=" + id +
+                ", orderNumber=" + orderNumber +
+                ", userId=" + userId +
+                ", insertTime=" + insertTime +
+                ", goodsId=" + goodsId +
+                ", count=" + count +
+                ", state=" + state +
+                ", express=" + express +
+                ", expressNumber=" + expressNumber +
+                ", expressTime=" + expressTime +
+                ", integral=" + integral +
+                "}";
     }
 }

--
Gitblit v1.7.1