From 2fa5571c76fa3a9f115a7e7598b297879a437228 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 13 八月 2024 18:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs

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

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

--
Gitblit v1.9.1