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/BasCrnStatus.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
index dff9d30..fdc4a58 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -22,7 +22,7 @@
/**
* 宸ヤ綔浠ｅ彿
*/
- @ApiModelProperty(value= "宸ヤ綔浠ｅ彿")
+ @ApiModelProperty(value= "鐘舵�佷唬鍙�")
@TableId(value = "sts_no", type = IdType.INPUT)
@TableField("sts_no")
private String stsNo;
--
Gitblit v1.9.1