From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsLiuyangJihuaBiangengCalculateParam.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsLiuyangJihuaBiangengCalculateParam.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsLiuyangJihuaBiangengCalculateParam.java
new file mode 100644
index 0000000..92b2feb
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsLiuyangJihuaBiangengCalculateParam.java
@@ -0,0 +1,29 @@
+package jnpf.limsEntity;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鐣欐牱璁″垝鍙樻洿璁$畻鍏ュ弬銆�
+ */
+@Data
+public class LimsLiuyangJihuaBiangengCalculateParam {
+
+    /** 鍘熺暀鏍疯鍒� f_id */
+    @JsonProperty("liuyang_jihua_id")
+    @JsonAlias({"id", "jihua_id", "liuyangJihuaId"})
+    private String liuyangJihuaId;
+
+    /** 鐣欐牱鍛ㄦ湡涓昏〃 f_id */
+    @JsonProperty("liuyang_zhouqi_id")
+    @JsonAlias({"zhouqi_id", "wendingxing_zhouqi_id", "liuyang_wendingxing_zhouqi_id", "wendingxingZhouqiId"})
+    private String liuyangZhouqiId;
+
+    /** 鏂扮殑鐣欐牱鏃ユ湡 */
+    @JsonProperty("liuyang_riqi")
+    @JsonAlias({"liuyangRiqi"})
+    private Date liuyangRiqi;
+}

--
Gitblit v1.8.0