From 89b19f453e03402aa2c8a588e5be1f491c007141 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 11 三月 2025 13:49:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into front
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
index 5eb0b73..ee03739 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -4,6 +4,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.ShipperService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -40,7 +41,7 @@
* 缂栧彿
*/
@ApiModelProperty(value= "缂栧彿")
- private String uuid;
+ private String type;
/**
* 鍚嶇О
@@ -138,7 +139,7 @@
public WarehouseAreas() {}
public WarehouseAreas(String uuid,String name,String code,Long shipperId,Short supplierId,Short flagMinus,Short flagLabelMange,Short flagMix,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
+ this.type = uuid;
this.name = name;
this.code = code;
this.shipperId = shipperId;
@@ -176,8 +177,8 @@
// );
public String getShipperId$(){
- ShipperService service = SpringUtils.getBean(ShipperService.class);
- Shipper shipper = service.getById(this.shipperId);
+ CompanysService service = SpringUtils.getBean(CompanysService.class);
+ Companys shipper = service.getById(this.shipperId);
if (!Cools.isEmpty(shipper)){
return String.valueOf(shipper.getName());
}
--
Gitblit v1.9.1