From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java b/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java
index 949355e..5e97d2b 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java
@@ -45,7 +45,14 @@
@ValueTableShow(3)
@ApiModelProperty(value = "浼樺厛绾�")
- private Integer orderNum;
+ private Double orderNum;
+
+ /**
+ * 绫诲瀷
+ */
+ @ValueTableShow(3)
+ @ApiModelProperty(value = "绫诲瀷")
+ private String type;
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
--
Gitblit v1.9.3