From bfeba8a69c0234a88eb71a1d2a7bf4b2aa0cd67a Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 10 九月 2024 19:06:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs

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

diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index a4947ff..3e942cb 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -71,7 +71,8 @@
 	@ApiModelProperty(value= "棰滆壊")
 	private String color;
 
-	@ApiModelProperty(value= "鍝佺墝")
+	@ApiModelProperty(value= "绫诲瀷")
+//    @ApiModelProperty(value= "鍝佺墝")
 	private String brand;
 
 	@ApiModelProperty(value= "鍗曚綅")

--
Gitblit v1.9.1