From 2e1553e8a7120c2d38d69a8f400dcca2557b09fb Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 26 十二月 2025 15:59:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java
index 113a8fd..886d288 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/mm/FinishedOperateLogDTO.java
@@ -1,6 +1,7 @@
package com.example.erp.dto.mm;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.example.erp.entity.mm.FinishedOperateLog;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -33,6 +34,8 @@
private Double height;
@ExcelProperty("闈㈢Н")
private Double area;
+ @ExcelProperty("骞虫柟姣背")
+ private Double squareMillimeter;
@ExcelProperty("閲戦")
private Double money;
@ExcelProperty("椤圭洰鍚嶇О")
--
Gitblit v1.8.0