潘钊 / bsth_control · Commits

Commit d3a02a96d55c722e04ebf4a8862690eeef511d3a

Authored by 潘钊
2 parents 6cd98b37 38ef3a7c
build: skipped

Merge branch 'minhang' into qingpu 

# Conflicts:
#	src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
#	src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
#	src/main/resources/application-dev.properties
#	src/main/resources/static/index.html
#	src/main/resources/static/real_control_v2/css/line_schedule.css
#	src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
#	src/main/resources/static/real_control_v2/js/main.js
#	src/main/resources/static/real_control_v2/main.html
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at