From 358d17658629931964ad421be77c94240310ed63 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 26 六月 2024 13:27:36 +0800
Subject: [PATCH] Merge branch 'phpsasrs' of http://47.97.1.152:5880/r/zy-asrs 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