guoao_update

# 绑定关系与物料类型控制

# 绑定关系/禁止关系/重构

# 读取装载/卸载能力,添加设备可用性
# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# 虚拟环境
# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# 删除冗余log
# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# 秀出冗余log
# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

# Conflicts:
#	realtime_dispatch.py
#	settings.py
#	static_data_process.py
#	tables.py
#	traffic_flow_planner.py

hi