Commit 278c7ef62cf3f24a8adc96130c6187cea34223d5
Merge branch 'pudong' into jiading
# Conflicts: # src/main/java/com/bsth/XDApplication.java # src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java # src/main/java/com/bsth/entity/Cars.java # src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java # src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java # src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java # src/main/resources/application-prod.properties # src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html # src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
.gitlab-ci.yml not found in this commit
Latest builds
| Status | Build ID | Ref | Stage | Name | Duration | Finished at |
|---|