Commit 955475db53fbb2dd50c8f44dbb376ea8adb6cc49

Authored by 廖磊
2 parents d32f9c89 57ed9773

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into

minhang

# Conflicts:
#	src/main/java/com/bsth/data/schedule/DayOfSchedule.java
#	src/main/resources/static/assets/plugins/fileinput/fileinput.min.js
#	src/main/resources/static/assets/plugins/fileinput/purify.min.js
#	src/main/resources/static/assets/plugins/fileinput/sortable.min.js
#	src/main/resources/static/real_control_v2/fragments/north/nav/tts_config.html
#	src/main/resources/static/real_control_v2/js/utils/tts.js
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at