From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/entity/MatCodePrint.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCodePrint.java b/src/main/java/com/zy/asrs/entity/MatCodePrint.java
index 3e7848e..124c618 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodePrint.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodePrint.java
@@ -6,7 +6,7 @@
public class MatCodePrint {
/**
- * 鍗曟嵁鍙�
+ * 鐗╂枡鍙�
*/
private String matNo;
--
Gitblit v1.9.1