潘钊 / bsth_control · Commits

into pudong

# 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

场外加油管理查询车辆每天实时线路
行车路单同工号不同名字驾驶员合并

2、修改BEntity里createBy updateBy的关联选项CascadeType为Refresh