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/BasSte.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasSte.java b/src/main/java/com/zy/asrs/entity/BasSte.java
index cd557b1..e5425e6 100644
--- a/src/main/java/com/zy/asrs/entity/BasSte.java
+++ b/src/main/java/com/zy/asrs/entity/BasSte.java
@@ -126,6 +126,13 @@
private String pakMk;
/**
+ * 鑷姩鍏呯數
+ */
+ @ApiModelProperty(value= "鑷姩鍏呯數")
+ @TableField("auto_charge")
+ private String autoCharge;
+
+ /**
* 鏈�浣庣數閲�
*/
@ApiModelProperty(value= "鏈�浣庣數閲�")
--
Gitblit v1.9.1