From 42bc535c947bcf999c706a753635d35ef73f91e6 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 22 四月 2024 09:11:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
index 1f73f53..0a27f16 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
@@ -1,5 +1,6 @@
 package com.example.erp.entity.sd;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,9 +14,11 @@
 @TableName("sd.`order`")
 public class Order {
     @TableId(type = IdType.AUTO)
-
+    @ExcelProperty("id")
     private Long id;
+    @ExcelProperty("璁㈠崟缂栧彿")
     private String orderId;
+    @ExcelProperty("椤圭洰鍚嶇О")
     private String project;
     private Integer customerId;
     private String customerName;
@@ -55,6 +58,8 @@
     private Integer delivery;
     private LocalDate createTime;
     private LocalDate updateTime;
+    @TableField(select = false,exist = false)
+    private Integer goodsQuantity;
 
     @TableField(value = "customer_id")
     private Customer  customer;

--
Gitblit v1.8.0