From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: Thu, 23 Feb 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialDepartmentDto.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialDepartmentDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialDepartmentDto.java
index 989d7be..c72fe26 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialDepartmentDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialDepartmentDto.java
@@ -8,7 +8,7 @@
//部门名称
private String depName;
//基础物资设备
- private List<BaseMaterialDto> baseMaterialList;
+ private List<MaterialClassificationDto> classificationList;
public Long getDepId() {
return depId;
@@ -26,11 +26,11 @@
this.depName = depName;
}
- public List<BaseMaterialDto> getBaseMaterialList() {
- return baseMaterialList;
+ public List<MaterialClassificationDto> getClassificationList() {
+ return classificationList;
}
- public void setBaseMaterialList(List<BaseMaterialDto> baseMaterialList) {
- this.baseMaterialList = baseMaterialList;
+ public void setClassificationList(List<MaterialClassificationDto> classificationList) {
+ this.classificationList = classificationList;
}
}
--
Gitblit v1.9.2