From ebce471ec71ea6acdef92b4316d12e62ae223512 Mon Sep 17 00:00:00 2001
From: zjj <zjj123>
Date: 星期一, 29 九月 2025 13:42:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/integrationWms' into integrationWms
---
src/main/java/com/zy/asrs/entity/BasWhsType.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasWhs.java b/src/main/java/com/zy/asrs/entity/BasWhsType.java
similarity index 94%
rename from src/main/java/com/zy/asrs/entity/BasWhs.java
rename to src/main/java/com/zy/asrs/entity/BasWhsType.java
index 1945dc2..b2094ca 100644
--- a/src/main/java/com/zy/asrs/entity/BasWhs.java
+++ b/src/main/java/com/zy/asrs/entity/BasWhsType.java
@@ -14,8 +14,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-@TableName("asr_bas_whs")
-public class BasWhs implements Serializable {
+@TableName("asr_bas_whs_type")
+public class BasWhsType implements Serializable {
private static final long serialVersionUID = 1L;
@@ -67,9 +67,9 @@
@ApiModelProperty(value= "鏍囪瘑")
private String identifying;
- public BasWhs() {}
+ public BasWhsType() {}
- public BasWhs(String whsDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public BasWhsType(String whsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.whsDesc = whsDesc;
this.modiUser = modiUser;
this.modiTime = modiTime;
--
Gitblit v1.9.1