From c253255495465d4406fcaddeb7be40d15fce290a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/entity/Mat.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 84cf369..a167280 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -95,14 +95,14 @@
* 棰滆壊
*/
@ApiModelProperty(value= "棰滆壊")
- @ExcelProperty(value = "瀛樿揣鍒嗙被鍚嶇О")
+ @ExcelProperty(value = "鍟嗗搧鍒嗙被鍚嶇О")
private String color;
/**
* 鍝佺墝
*/
@ApiModelProperty(value= "鍝佺墝")
- @ExcelProperty(value = "瀛樿揣鍒嗙被缂栫爜")
+ @ExcelProperty(value = "鍟嗗搧鍒嗙被缂栫爜")
private String brand;
/**
--
Gitblit v1.9.1