From 51da7fb82af136ddb931422b7427ac15119314a1 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 21 八月 2025 15:02:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czscwcs-version' into czscwcs-version
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 7b18171..e542a25 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -271,8 +271,8 @@
private String manuType;
@ApiModelProperty(value= "")
- @TableField("memo_m")
- private String memoM;
+ @TableField("memo")
+ private String memo;
@ApiModelProperty(value= "")
@TableField("sc_weight")
--
Gitblit v1.9.1