From e4d5a0e37babc1ae214c34162e58f5084927d301 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 14:26:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
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