潘钊 / bsth_control · Commits

# Conflicts:
#	src/main/resources/static/real_control_v2/assets/plugins/layer3.0.3/layer.js

# Conflicts:
#	src/main/resources/static/real_control_v2/assets/plugins/layer3.0.3/layer.js

# Conflicts:
#	src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java

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

# Conflicts:
#	src/main/resources/static/real_control_v2/js/forms/wrap.html

# Conflicts:
#	src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java

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

# Conflicts:
#	src/main/resources/application-dev.properties