潘钊 / bsth_control · Commits

Commit daa64c1cd964d2357a99b524c240a197915252f0

Authored by 王通
2 parents 95438552 00c4de1b
build: skipped

Merge branch 'pudong' into pudong_test 

# Conflicts:
#	src/main/java/com/bsth/XDApplication.java
#	src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController_facade.java
#	src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
#	src/main/resources/datatools/ktrs/ttinfodetailoutputforedit.ktr
#	src/main/resources/dubbo/config-dev.properties
#	src/main/resources/dubbo/config-prod.properties
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at