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/WrkDetl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index ae755c0..8c22259 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -41,9 +41,9 @@
private Double anfme;
/**
- * 鎵樼洏鏉＄爜
+ * 璐ф灦鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value= "璐ф灦鏉＄爜")
private String zpallet;
/**
--
Gitblit v1.9.1