From 18e1abc0c5623137e9689d4bd30701d946e4cd88 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 15:44:18 +0800
Subject: [PATCH] fix(营销): 回款流水导出全空(copyBeanProp参数顺序反了+字段名不匹配)、开票台账SQL漏字段invoice_registration_product_id/invoice_total
---
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index 431188d..c7242b2 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -20,16 +20,30 @@
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
+
+
+ private String deviceName;
+
+ private String deviceModel;
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
- private Date maintenancePlanTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime maintenancePlanTime;
+ @ApiModelProperty("淇濆吇鍛ㄦ湡")
+ private String maintenanceCycle;
+
+ @ApiModelProperty("淇濆吇鍐呭")
+ private String maintenanceContent;
@ApiModelProperty("瀹為檯淇濆吇浜�")
private String maintenanceActuallyName;
@ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
- private Date maintenanceActuallyTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime maintenanceActuallyTime;
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private Integer maintenanceResult;
--
Gitblit v1.9.3