From 2c51e2bac7e271f6bd1a7da060e4ffd327d5a8d2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 18:06:06 +0800
Subject: [PATCH] feat(production): 更新生产核算逻辑以支持设备和工时计算
---
src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java b/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java
index bd73a31..5f174a5 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -34,9 +35,9 @@
private Integer id;
/**
- * 鍏宠仈鐨勫鎴稩D
+ * 鍏宠仈鐨勭娴穒d
*/
- private Integer customerId;
+ private Long customerPrivatePoolId;
/**
* 璺熻繘鏂瑰紡
@@ -52,6 +53,7 @@
* 璺熻繘鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime followUpTime;
/**
--
Gitblit v1.9.3