cbx
/
srt_cloud
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar
#	srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java
pull/3/head
fjj 2023-12-24 10:09:49 +08:00
parent efd3b81dc8 486346b618
commit 86303182f7
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
srt-data-development/src/main/java/net/srt/Hadoop/convert/HadoopConvert.java
View File

@ -1,11 +1,6 @@
package net.srt.Hadoop.convert;
import net.srt.Fink.convert.FinkConvert;
import net.srt.Fink.dto.FinkAddDto;
import net.srt.Fink.entity.FinkEntity;
import net.srt.Fink.vo.FinkVo;
import net.srt.Hadoop.dto.HadoopAddDto;
import net.srt.Hadoop.dto.HadoopDto;
import net.srt.Hadoop.entity.HadoopEntity;
import net.srt.Hadoop.vo.HadoopVo;
import org.mapstruct.Mapper;

1
srt-data-development/src/main/java/net/srt/disposition/service/impl/DataProductionServiceImpl.java
View File

@ -93,5 +93,4 @@ public class DataProductionServiceImpl extends BaseServiceImpl<DataProductionMap
}
return path;
}
}

4
srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java
View File

@ -11,8 +11,8 @@ import java.util.List;
@Data
public class DataProductionTreeVo {
private Long id;
private Long parentId;
private Integer id;
private Integer parentId;
private Integer ifLeaf;
private Long taskId;
private String taskType;