潘钊 / bsth_control · Commits

# Conflicts:
#	src/main/resources/fatso/handle_real_ctl.js

# Conflicts:
#	src/main/resources/fatso/handle_real_ctl.js

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

# Conflicts:
#	src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

# Conflicts:
#	src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java

# Conflicts:
#	src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html