From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto

---
 src/main/java/com/zy/asrs/entity/CombParam.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/CombParam.java b/src/main/java/com/zy/asrs/entity/CombParam.java
index 74e7ea9..a3571f1 100644
--- a/src/main/java/com/zy/asrs/entity/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/CombParam.java
@@ -40,6 +40,7 @@
         private Double anfme;
 
         private Double weight;
+        private String memo;
 
     }
 

--
Gitblit v1.9.1