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/bizlog/LimsBizLogVo.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/bizlog/LimsBizLogVo.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/bizlog/LimsBizLogVo.java
new file mode 100644
index 0000000..99b7281
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/bizlog/LimsBizLogVo.java
@@ -0,0 +1,52 @@
+package jnpf.limsEntity.bizlog;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+/**
+ * 涓氬姟鏃ュ織鍒楄〃杩斿洖 VO銆傚瓧娈靛榻愬墠绔� {@code VisualLogVo}锛屼究浜� {@code DataLogList.vue} 闆舵牱寮忔敼鍔ㄥ湴澶嶇敤銆�
+ * <p>
+ * 娉ㄦ剰锛歿@code dataLog} 鍜� {@code extraJson} 淇濇寔涓� JSON 瀛楃涓插師鏍蜂笅鍙戯紝鍓嶇 {@code DataLogList.vue}
+ * 浼氬仛 {@code JSON.parse}锛堟部鐢ㄥ钩鍙板師鐢熸棩蹇楃殑澶勭悊鏂瑰紡锛夈��
+ *
+ * <p><strong>鍛藉悕绛栫暐</strong>锛欽NPF 鍏ㄥ眬 {@code JacksonConfig} 鎶� ObjectMapper 閰嶆垚
+ * {@code PropertyNamingStrategies.SNAKE_CASE}锛屼細鎶婇┘宄板瓧娈靛悕搴忓垪鍖栨垚涓嬪垝绾�
+ * 锛坽@code creatorTime} 鈫� {@code creator_time}锛夈��
+ * 浣嗗墠绔� {@code DataLogList.vue} 娌跨敤 JNPF 鍘熺敓 {@code VisualLogVo} 鐨勯┘宄扮害瀹氥��
+ * 鐢� {@link JsonNaming} 娉ㄨВ**灞�閮ㄨ鐩�**鍏ㄥ眬绛栫暐锛屼繚鐣欐湰 VO 鐨勯┘宄拌緭鍑猴紝閬垮厤鏀瑰叏灞�褰卞搷鍏跺畠鎺ュ彛銆�
+ */
+@Data
+@JsonNaming(PropertyNamingStrategies.LowerCamelCaseStrategy.class)
+public class LimsBizLogVo {
+
+    private String id;
+
+    private Long logSeq;
+
+    /** 涓庡墠绔� type 瀛楁瀵归綈锛氳 {@link BizLogAction#getFrontendType()} */
+    private Integer type;
+
+    private String actionType;
+
+    private String actionLabel;
+
+    private String bizCode;
+
+    private String bizType;
+
+    /** 鎿嶄綔鏃堕棿锛堝凡鏍煎紡鍖栦负 yyyy-MM-dd HH:mm锛� */
+    private String creatorTime;
+
+    private String creatorUserId;
+
+    private String creatorUserName;
+
+    private String headIcon;
+
+    /** VisualLogModel[] 鐨� JSON 瀛楃涓诧紝鍓嶇 JSON.parse 瑙f瀽 */
+    private String dataLog;
+
+    /** 鑷敱缁撴瀯鍏冩暟鎹� JSON 瀛楃涓� */
+    private String extraJson;
+}

--
Gitblit v1.8.0