From d7eba1786ed1fba2b3674f9da3af4fbf1a3f8692 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 01 六月 2023 18:49:05 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
index 47f0387..e833756 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
@@ -5,17 +5,17 @@
import java.util.List;
public class SysIntInfoBseDTO extends BaseModelVO {
- private SysIntInfoDTO sysIntInfoDTO;
+ private DockingSystemConfigDTO sysIntInfoDTO;
private List<SysIntParamDTO> sysIntParamDTO;
private List<SysIntHeaderDTO> sysIntHeaderDTOS;
- public SysIntInfoDTO getSysIntInfoDTO() {
+ public DockingSystemConfigDTO getSysIntInfoDTO() {
return sysIntInfoDTO;
}
- public void setSysIntInfoDTO(SysIntInfoDTO sysIntInfoDTO) {
+ public void setSysIntInfoDTO(DockingSystemConfigDTO sysIntInfoDTO) {
this.sysIntInfoDTO = sysIntInfoDTO;
}
--
Gitblit v1.9.3